From f9a31f0ab81a2b5d2cf8b936792a78f0b49af848 Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Mon, 4 May 2009 20:46:25 +0400 Subject: [PATCH] --- yaml --- r: 150183 b: refs/heads/master c: 8a7130404948b966e98b1285e777972b4b3f2fa2 h: refs/heads/master i: 150181: d33a937963e2a177b64692618a6b8bd30307a286 150179: 2244e251bd79aa366c6a4e0c8b1bb6661db63c98 150175: 4e3c52d4a7f640c034a3d3788704b20577f6d2f1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ar9170/usb.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2a204d65d52a..82bb01a07603 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7738231f98578c8cd5b367441b4aa79ce864856f +refs/heads/master: 8a7130404948b966e98b1285e777972b4b3f2fa2 diff --git a/trunk/drivers/net/wireless/ath/ar9170/usb.c b/trunk/drivers/net/wireless/ath/ar9170/usb.c index d7b562dcebd2..d7c13c0177ca 100644 --- a/trunk/drivers/net/wireless/ath/ar9170/usb.c +++ b/trunk/drivers/net/wireless/ath/ar9170/usb.c @@ -689,7 +689,9 @@ 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; +#ifdef CONFIG_PM udev->reset_resume = 1; +#endif err = ar9170_usb_reset(aru); if (err) goto err_freehw;