diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2010-12-03 13:15:41 -0800 |
|---|---|---|
| committer | Luis R. Rodriguez <lrodriguez@atheros.com> | 2010-12-03 13:15:41 -0800 |
| commit | 58ca035ddc96e4cd142f74a5cf0fadb879290634 (patch) | |
| tree | 574569996572240d29c1abef24efe2e57191a1bf /crap | |
| parent | 320e2efefc2395a14746fd0a34a03b9dadc39158 (diff) | |
compat-wireless: fix crap packetlog patch
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Diffstat (limited to 'crap')
| -rw-r--r-- | crap/0002-ath9k-Add-pktlog-support.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch index 96ffc108..d0e3f12c 100644 --- a/crap/0002-ath9k-Add-pktlog-support.patch +++ b/crap/0002-ath9k-Add-pktlog-support.patch @@ -131,19 +131,19 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> goto err; + if (ath9k_init_pktlog(sc) != 0) -+ goto err; ++ return -EINVAL; + return 0; err: ath9k_exit_debug(ah); -@@ -997,6 +1000,7 @@ void ath9k_exit_debug(struct ath_hw *ah) - struct ath_common *common = ath9k_hw_common(ah); - struct ath_softc *sc = (struct ath_softc *) common->priv; - +@@ -982,6 +985,7 @@ + sc->debug.regidx = 0; + return 0; + err: + ath9k_deinit_pktlog(sc); - debugfs_remove(sc->debug.debugfs_regdump); debugfs_remove_recursive(sc->debug.debugfs_phy); - } + sc->debug.debugfs_phy = NULL; + return -ENOMEM; --- a/drivers/net/wireless/ath/ath9k/hw-ops.h +++ b/drivers/net/wireless/ath/ath9k/hw-ops.h @@ -67,9 +67,10 @@ static inline void ath9k_hw_filltxdesc(s |