diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-11-17 20:28:39 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-11-17 20:28:39 (GMT) |
| commit | 9b5186b4be26d1fb8d63a3001b2e6ff0b2e2f82f (patch) | |
| tree | 6dcb087aaf91e1e2d3489934d777e67e5ac34047 /drivers/net/wireless/ath/ath6kl | |
| parent | a15c706889753a92ccf90a55516a4f0c87a02201 (diff) | |
| parent | 9de8f26f0038133bdfb8cf847936645dab949d88 (diff) | |
| download | linux-9b5186b4be26d1fb8d63a3001b2e6ff0b2e2f82f.tar.xz | |
Merge branch 'for-linville' of git://github.com/kvalo/ath
Kalle Valo <kvalo@qca.qualcomm.com> says:
"One ath6kl patch and rest for ath10k, but nothing really major which
stands out. Most notable:
o fix resume (Bartosz)
o firmware restart is now faster and more reliable (Michal)
o it's now possible to test hardware restart functionality without
crashing the firmware using hw-restart parameter with
simulate_fw_crash debugfs file (Michal)"
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/usb.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/usb.c b/drivers/net/wireless/ath/ath6kl/usb.c index a6a5e40..9da3594 100644 --- a/drivers/net/wireless/ath/ath6kl/usb.c +++ b/drivers/net/wireless/ath/ath6kl/usb.c @@ -1193,18 +1193,10 @@ static int ath6kl_usb_pm_resume(struct usb_interface *interface) return 0; } -static int ath6kl_usb_pm_reset_resume(struct usb_interface *intf) -{ - if (usb_get_intfdata(intf)) - ath6kl_usb_remove(intf); - return 0; -} - #else #define ath6kl_usb_pm_suspend NULL #define ath6kl_usb_pm_resume NULL -#define ath6kl_usb_pm_reset_resume NULL #endif @@ -1222,7 +1214,6 @@ static struct usb_driver ath6kl_usb_driver = { .probe = ath6kl_usb_probe, .suspend = ath6kl_usb_pm_suspend, .resume = ath6kl_usb_pm_resume, - .reset_resume = ath6kl_usb_pm_reset_resume, .disconnect = ath6kl_usb_remove, .id_table = ath6kl_usb_ids, .supports_autosuspend = true, |