diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-31 21:22:17 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-31 21:22:17 +0200 |
| commit | 96da266e77637ae892b196f377908c51fa9f2d1a (patch) | |
| tree | bf3da12850bbd46082add3060f9a5253aed144e0 /drivers/net/wireless/mwifiex/usb.c | |
| parent | Merge branch 'filter-next' (diff) | |
| parent | rtl8187: fix use after free on failure path in rtl8187_probe() (diff) | |
| download | linux-96da266e77637ae892b196f377908c51fa9f2d1a.tar.xz linux-96da266e77637ae892b196f377908c51fa9f2d1a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/mwifiex/usb.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c index ae30c390ebd3..edbe4aff00d8 100644 --- a/drivers/net/wireless/mwifiex/usb.c +++ b/drivers/net/wireless/mwifiex/usb.c @@ -459,6 +459,7 @@ static int mwifiex_usb_suspend(struct usb_interface *intf, pm_message_t message) * 'suspended' state and a 'disconnect' one. */ adapter->is_suspended = true; + adapter->hs_enabling = false; if (atomic_read(&card->rx_cmd_urb_pending) && card->rx_cmd.urb) usb_kill_urb(card->rx_cmd.urb); |