mac80211: update to wireless-testing+wireless-2.6 from 2010-01-13
[openwrt-10.03/.git] / package / mac80211 / patches / 300-ath9k_fix_init_crash.patch
1 --- a/drivers/net/wireless/ath/ath9k/ahb.c
2 +++ b/drivers/net/wireless/ath/ath9k/ahb.c
3 @@ -121,6 +121,9 @@ static int ath_ahb_probe(struct platform
4         sc->mem = mem;
5         sc->irq = irq;
6  
7 +       /* Will be cleared in ath9k_start() */
8 +       sc->sc_flags |= SC_OP_INVALID;
9 +
10         ret = request_irq(irq, ath_isr, IRQF_SHARED, "ath9k", sc);
11         if (ret) {
12                 dev_err(&pdev->dev, "request_irq failed\n");
13 --- a/drivers/net/wireless/ath/ath9k/init.c
14 +++ b/drivers/net/wireless/ath/ath9k/init.c
15 @@ -534,8 +534,6 @@ static int ath9k_init_softc(u16 devid, s
16         int ret = 0, i;
17         int csz = 0;
18  
19 -       sc->sc_flags |= SC_OP_INVALID;
20 -
21         ah = kzalloc(sizeof(struct ath_hw), GFP_KERNEL);
22         if (!ah)
23                 return -ENOMEM;
24 --- a/drivers/net/wireless/ath/ath9k/pci.c
25 +++ b/drivers/net/wireless/ath/ath9k/pci.c
26 @@ -202,6 +202,9 @@ static int ath_pci_probe(struct pci_dev 
27         sc->dev = &pdev->dev;
28         sc->mem = mem;
29  
30 +       /* Will be cleared in ath9k_start() */
31 +       sc->sc_flags |= SC_OP_INVALID;
32 +
33         ret = request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath9k", sc);
34         if (ret) {
35                 dev_err(&pdev->dev, "request_irq failed\n");