diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-19 03:29:41 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-19 03:29:41 (GMT) |
| commit | 4da0bd736552e6377b407b3c3d3ae518ebbdd269 (patch) | |
| tree | f0da9f843b8033565c3ca4103fccb17a60688326 /drivers/net/wireless/iwlegacy/3945-mac.c | |
| parent | 81a430ac1b88b0702c57d2513e247317e810e04d (diff) | |
| parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
| download | linux-fsl-qoriq-4da0bd736552e6377b407b3c3d3ae518ebbdd269.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945-mac.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/3945-mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index 0ccc934..0c12093 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c @@ -2466,7 +2466,7 @@ il3945_bg_alive_start(struct work_struct *data) container_of(data, struct il_priv, alive_start.work); mutex_lock(&il->mutex); - if (test_bit(S_EXIT_PENDING, &il->status)) + if (test_bit(S_EXIT_PENDING, &il->status) || il->txq == NULL) goto out; il3945_alive_start(il); |