summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ar9170/usb.c
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@web.de>2009-04-25 21:32:09 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-05-06 21:14:42 +0200
commit90ccda9baccec8223ca5456fbe49adf7264d1543 (patch)
treee323258f5f538cf59470d0cfa692246520b14d06 /drivers/net/wireless/ath/ar9170/usb.c
parentp54usb: rework driver for resume (diff)
downloadlinux-90ccda9baccec8223ca5456fbe49adf7264d1543.tar.xz
linux-90ccda9baccec8223ca5456fbe49adf7264d1543.zip
ar9170usb: reset device on resume
This patch takes care of an outstanding comment in "[PATCH] ar9170usb: fix hang on resume" commit message. >However, the device does not accept the firmware on resume. >and it will exit with: > >> firmware part 1 upload failed (-71). >> device is in a bad state. please reconnect it! Reported-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Christian Lamparter <chunkeey@web.de> Tested-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ar9170/usb.c')
-rw-r--r--drivers/net/wireless/ath/ar9170/usb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c
index fddda477095c..368fc2d42641 100644
--- a/drivers/net/wireless/ath/ar9170/usb.c
+++ b/drivers/net/wireless/ath/ar9170/usb.c
@@ -689,6 +689,7 @@ static int ar9170_usb_probe(struct usb_interface *intf,
aru->common.exec_cmd = ar9170_usb_exec_cmd;
aru->common.callback_cmd = ar9170_usb_callback_cmd;
+ udev->reset_resume = 1;
err = ar9170_usb_reset(aru);
if (err)
goto err_freehw;
@@ -805,6 +806,7 @@ static struct usb_driver ar9170_driver = {
#ifdef CONFIG_PM
.suspend = ar9170_suspend,
.resume = ar9170_resume,
+ .reset_resume = ar9170_resume,
#endif /* CONFIG_PM */
};