diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-24 09:16:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-24 09:16:14 -0800 |
| commit | 66fc5dff5e4f82c92723202a5de9bdec16a9331f (patch) | |
| tree | 4c9d2e740db2316d73c1e6bed3d6bb08cb052a73 /drivers/net | |
| parent | 9915672d41273f5b77f1b3c29b391ffb7732b84b (diff) | |
| parent | e476a5a41ad67d0e2b4a652820c49a3923eb936b (diff) | |
| download | blackbird-obmc-linux-66fc5dff5e4f82c92723202a5de9bdec16a9331f.tar.gz blackbird-obmc-linux-66fc5dff5e4f82c92723202a5de9bdec16a9331f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/main.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/b43/sdio.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index c76ea53c20ce..1a62e351ec77 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c @@ -518,7 +518,7 @@ bool ath_stoprecv(struct ath_softc *sc) bool stopped; spin_lock_bh(&sc->rx.rxbuflock); - ath9k_hw_stoppcurecv(ah); + ath9k_hw_abortpcurecv(ah); ath9k_hw_setrxfilter(ah, 0); stopped = ath9k_hw_stopdmarecv(ah); diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index 980ae70ea424..a314c2c2bfbe 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c @@ -647,7 +647,7 @@ init: } unlock: - if (err && (vif_id != -1)) { + if (err && (vif_id >= 0)) { vif_priv->active = false; bitmap_release_region(&ar->vif_bitmap, vif_id, 0); ar->vifs--; diff --git a/drivers/net/wireless/b43/sdio.c b/drivers/net/wireless/b43/sdio.c index 9a55338d957f..09e2dfd7b175 100644 --- a/drivers/net/wireless/b43/sdio.c +++ b/drivers/net/wireless/b43/sdio.c @@ -163,6 +163,7 @@ static int b43_sdio_probe(struct sdio_func *func, err_free_ssb: kfree(sdio); err_disable_func: + sdio_claim_host(func); sdio_disable_func(func); err_release_host: sdio_release_host(func); |
