diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-11-24 16:19:24 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-24 16:19:24 -0500 |
| commit | d7a066c92394f3e777351de0c903beeb8a08af76 (patch) | |
| tree | f54ce8ac77d32b4c3166b4a2ca92525174a3213b /drivers/net/wireless/ath/carl9170/main.c | |
| parent | ccb14354017272ddac002e859a2711610b6af174 (diff) | |
| parent | e476a5a41ad67d0e2b4a652820c49a3923eb936b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index 4ae6a5849076..511dbe3caf58 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c | |||
| @@ -663,7 +663,7 @@ init: | |||
| 663 | } | 663 | } |
| 664 | 664 | ||
| 665 | unlock: | 665 | unlock: |
| 666 | if (err && (vif_id != -1)) { | 666 | if (err && (vif_id >= 0)) { |
| 667 | vif_priv->active = false; | 667 | vif_priv->active = false; |
| 668 | bitmap_release_region(&ar->vif_bitmap, vif_id, 0); | 668 | bitmap_release_region(&ar->vif_bitmap, vif_id, 0); |
| 669 | ar->vifs--; | 669 | ar->vifs--; |