Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / drivers / usb / core / generic.c

diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index 1522195..16332cc 100644 (file)
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -172,34 +172,16 @@ static void generic_disconnect(struct usb_device *udev)
 
        /* if this is only an unbind, not a physical disconnect, then
         * unconfigure the device */
-       if (udev->state == USB_STATE_CONFIGURED)
+       if (udev->actconfig)
                usb_set_configuration(udev, 0);
 
        usb_remove_sysfs_dev_files(udev);
-
-       /* in case the call failed or the device was suspended */
-       if (udev->state >= USB_STATE_CONFIGURED)
-               usb_disable_device(udev, 0);
 }
 
 #ifdef CONFIG_PM
 
-static int verify_suspended(struct device *dev, void *unused)
-{
-       if (dev->driver == NULL)
-               return 0;
-       return (dev->power.power_state.event == PM_EVENT_ON) ? -EBUSY : 0;
-}
-
 static int generic_suspend(struct usb_device *udev, pm_message_t msg)
 {
-       int     status;
-
-       /* rule out bogus requests through sysfs */
-       status = device_for_each_child(&udev->dev, NULL, verify_suspended);
-       if (status)
-               return status;
-
        /* USB devices enter SUSPEND state through their hubs, but can be
         * marked for FREEZE as soon as their children are already idled.
         * But those semantics are useless, so we equate the two (sigh).
@@ -209,9 +191,6 @@ static int generic_suspend(struct usb_device *udev, pm_message_t msg)
 
 static int generic_resume(struct usb_device *udev)
 {
-       if (udev->state == USB_STATE_NOTATTACHED)
-               return 0;
-
        return usb_port_resume(udev);
 }
 
@@ -225,4 +204,5 @@ struct usb_device_driver usb_generic_driver = {
        .suspend = generic_suspend,
        .resume = generic_resume,
 #endif
+       .supports_autosuspend = 1,
 };