AA: mac80211: sync with trunk r41113

[12.09/openwrt.git] / package / mac80211 / patches / 502-ath9k_ahb_init.patch

diff --git a/package/mac80211/patches/502-ath9k_ahb_init.patch b/package/mac80211/patches/502-ath9k_ahb_init.patch
index 4edc63b..0c8e813 100644 (file)
--- a/package/mac80211/patches/502-ath9k_ahb_init.patch
+++ b/package/mac80211/patches/502-ath9k_ahb_init.patch
@@ -1,15 +1,15 @@
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -1112,23 +1112,23 @@ static int __init ath9k_init(void)
-               goto err_out;
-       }
+@@ -904,23 +904,23 @@ static int __init ath9k_init(void)
+ {
+       int error;
  
 -      error = ath_pci_init();
 +      error = ath_ahb_init();
        if (error < 0) {
 -              pr_err("No PCI devices found, driver not installed\n");
                error = -ENODEV;
-               goto err_rate_unregister;
+               goto err_out;
        }
  
 -      error = ath_ahb_init();
@@ -27,6 +27,6 @@
 -      ath_pci_exit();
 + err_ahb_exit:
 +      ath_ahb_exit();
- 
-  err_rate_unregister:
-       ath_rate_control_unregister();
+  err_out:
+       return error;
+ }