USB: remove leftover references to udev->autosuspend_disabled
authorAlan Stern <stern@rowland.harvard.edu>
Fri, 30 Apr 2010 16:14:04 +0000 (12:14 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 20 May 2010 20:21:40 +0000 (13:21 -0700)
This patch (as1373) fixes a couple of drivers outside the USB
subtree.  Devices are now disabled or enabled for autosuspend by
calling a core function instead of setting a flag.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/media/video/tlg2300/pd-main.c
drivers/net/wimax/i2400m/usb.c

index 2cf0ebf..a6400da 100644 (file)
@@ -455,8 +455,8 @@ static int poseidon_probe(struct usb_interface *interface,
 
        device_init_wakeup(&udev->dev, 1);
 #ifdef CONFIG_PM
-       pd->udev->autosuspend_disabled = 0;
        pd->udev->autosuspend_delay = HZ * PM_SUSPEND_DELAY;
+       usb_enable_autosuspend(pd->udev);
 
        if (in_hibernation(pd)) {
                INIT_WORK(&pd->pm_work, hibernation_resume);
index d8c4d64..d555e37 100644 (file)
@@ -505,7 +505,7 @@ int i2400mu_probe(struct usb_interface *iface,
        iface->needs_remote_wakeup = 1;         /* autosuspend (15s delay) */
        device_init_wakeup(dev, 1);
        usb_dev->autosuspend_delay = 15 * HZ;
-       usb_dev->autosuspend_disabled = 0;
+       usb_enable_autosuspend(usb_dev);
 #endif
 
        result = i2400m_setup(i2400m, I2400M_BRI_MAC_REINIT);