From 0f16c69f91172a1483b7214212144b29c60bc301 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Mon, 15 Sep 2008 17:29:28 +0200
Subject: [PATCH] --- yaml --- r: 115758 b: refs/heads/master c:
 399d31da4e2f701ba91cdb4b39e074d6e16174a9 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/core/driver.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ca5ed672688e..d8a5da08c7d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 682650437e7acef01e914a7fb6ef16da16bb69c5
+refs/heads/master: 399d31da4e2f701ba91cdb4b39e074d6e16174a9
diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c
index 5a7fa6f09958..e935be7eb468 100644
--- a/trunk/drivers/usb/core/driver.c
+++ b/trunk/drivers/usb/core/driver.c
@@ -1070,7 +1070,8 @@ static int autosuspend_check(struct usb_device *udev, int reschedule)
 				struct usb_driver *driver;
 
 				driver = to_usb_driver(intf->dev.driver);
-				if (!driver->reset_resume)
+				if (!driver->reset_resume ||
+				    intf->needs_remote_wakeup)
 					return -EOPNOTSUPP;
 			}
 		}