diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-03 23:34:45 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-03 23:34:45 +0400 |
| commit | 0c6a4812a0e1879daa6c8ac88e566dbb85e1ea70 (patch) | |
| tree | acf4cfcd93c103db52086bd5397b64aa3b828c7a /drivers/net/wireless/mwifiex | |
| parent | 635d61a3735e05c8da72740006670f819e5b6a5f (diff) | |
| parent | adb07df1e039e9fe43e66aeea8b4771f83659dbb (diff) | |
| download | linux-0c6a4812a0e1879daa6c8ac88e566dbb85e1ea70.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/mwifiex')
| -rw-r--r-- | drivers/net/wireless/mwifiex/usb.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c index cb6b70a1b34d..208748804a55 100644 --- a/drivers/net/wireless/mwifiex/usb.c +++ b/drivers/net/wireless/mwifiex/usb.c @@ -525,13 +525,6 @@ static int mwifiex_usb_resume(struct usb_interface *intf) MWIFIEX_BSS_ROLE_ANY), MWIFIEX_ASYNC_CMD); -#ifdef CONFIG_PM - /* Resume handler may be called due to remote wakeup, - * force to exit suspend anyway - */ - usb_disable_autosuspend(card->udev); -#endif /* CONFIG_PM */ - return 0; } @@ -571,7 +564,6 @@ static struct usb_driver mwifiex_usb_driver = { .id_table = mwifiex_usb_table, .suspend = mwifiex_usb_suspend, .resume = mwifiex_usb_resume, - .supports_autosuspend = 1, }; static int mwifiex_usb_tx_init(struct mwifiex_adapter *adapter) |