mac80211: update to 2012-04-17, adds some build fixes and juhosg's ar9380 tx power fix
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 502-ath9k_ahb_init.patch
1 --- a/drivers/net/wireless/ath/ath9k/init.c
2 +++ b/drivers/net/wireless/ath/ath9k/init.c
3 @@ -904,23 +904,23 @@ static int __init ath9k_init(void)
4 goto err_out;
5 }
6
7 - error = ath_pci_init();
8 + error = ath_ahb_init();
9 if (error < 0) {
10 - pr_err("No PCI devices found, driver not installed\n");
11 error = -ENODEV;
12 goto err_rate_unregister;
13 }
14
15 - error = ath_ahb_init();
16 + error = ath_pci_init();
17 if (error < 0) {
18 + pr_err("No PCI devices found, driver not installed\n");
19 error = -ENODEV;
20 - goto err_pci_exit;
21 + goto err_ahb_exit;
22 }
23
24 return 0;
25
26 - err_pci_exit:
27 - ath_pci_exit();
28 + err_ahb_exit:
29 + ath_ahb_exit();
30
31 err_rate_unregister:
32 ath_rate_control_unregister();