diff options
Diffstat (limited to 'drivers/net/wireless/ath/ar9170/usb.c')
-rw-r--r-- | drivers/net/wireless/ath/ar9170/usb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c index fddda477095c..d7c13c0177ca 100644 --- a/drivers/net/wireless/ath/ar9170/usb.c +++ b/drivers/net/wireless/ath/ar9170/usb.c | |||
@@ -350,7 +350,7 @@ static int ar9170_usb_exec_cmd(struct ar9170 *ar, enum ar9170_cmd cmd, | |||
350 | goto err_unbuf; | 350 | goto err_unbuf; |
351 | } | 351 | } |
352 | 352 | ||
353 | if (outlen >= 0 && aru->readlen != outlen) { | 353 | if (aru->readlen != outlen) { |
354 | err = -EMSGSIZE; | 354 | err = -EMSGSIZE; |
355 | goto err_unbuf; | 355 | goto err_unbuf; |
356 | } | 356 | } |
@@ -689,6 +689,9 @@ static int ar9170_usb_probe(struct usb_interface *intf, | |||
689 | aru->common.exec_cmd = ar9170_usb_exec_cmd; | 689 | aru->common.exec_cmd = ar9170_usb_exec_cmd; |
690 | aru->common.callback_cmd = ar9170_usb_callback_cmd; | 690 | aru->common.callback_cmd = ar9170_usb_callback_cmd; |
691 | 691 | ||
692 | #ifdef CONFIG_PM | ||
693 | udev->reset_resume = 1; | ||
694 | #endif | ||
692 | err = ar9170_usb_reset(aru); | 695 | err = ar9170_usb_reset(aru); |
693 | if (err) | 696 | if (err) |
694 | goto err_freehw; | 697 | goto err_freehw; |
@@ -805,6 +808,7 @@ static struct usb_driver ar9170_driver = { | |||
805 | #ifdef CONFIG_PM | 808 | #ifdef CONFIG_PM |
806 | .suspend = ar9170_suspend, | 809 | .suspend = ar9170_suspend, |
807 | .resume = ar9170_resume, | 810 | .resume = ar9170_resume, |
811 | .reset_resume = ar9170_resume, | ||
808 | #endif /* CONFIG_PM */ | 812 | #endif /* CONFIG_PM */ |
809 | }; | 813 | }; |
810 | 814 | ||