diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-06-11 12:30:50 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-11 12:30:50 +0000 |
| commit | 3153b7589c0831fdce97081d1ecf5b9310725576 (patch) | |
| tree | 5e4608250807827642c1d1fb19849d3671443ae7 /package/mac80211/patches/502-ath9k_ahb_init.patch | |
| parent | 312a176995ecf1b1b97a048451e4ff28b4336f85 (diff) | |
| download | upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.gz upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.bz2 upstream-3153b7589c0831fdce97081d1ecf5b9310725576.zip | |
AA: mac80211: sync with trunk r41113
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@41116 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/502-ath9k_ahb_init.patch')
| -rw-r--r-- | package/mac80211/patches/502-ath9k_ahb_init.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/mac80211/patches/502-ath9k_ahb_init.patch b/package/mac80211/patches/502-ath9k_ahb_init.patch index 4edc63bede..0c8e813a37 100644 --- 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; + } |