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>

diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c
index fddda477095ce3461f23a5861c3b22138487f735..368fc2d426419d1e3e2942b3d2d356cb06a9ad66 100644 (file)
--- 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 */
 };