1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 77e4c9bc0ab1..ebb29caa3fe4 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -311,7 +311,13 @@ static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env)
 
 static int usb_dev_prepare(struct device *dev)
 {
-        return 0;               /* Implement eventually? */
+        struct usb_device *udev = to_usb_device(dev);
+
+        /* Return 0 if the current wakeup setting is wrong, otherwise 1 */
+        if (udev->do_remote_wakeup != device_may_wakeup(dev))
+                return 0;
+
+        return 1;
 }
 
 static void usb_dev_complete(struct device *dev)