Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f15744c authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: fix leftover references to udev->autosuspend_delay 



This patch (as1436) takes care of leftover references to
udev->autosuspend_delay that didn't get removed during the earlier
conversion to the runtime-PM autosuspend API.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent aa02f172

drivers/media/video/tlg2300/pd-main.c

+2 −1
Original line number Diff line number Diff line
@@ -453,7 +453,8 @@ static int poseidon_probe(struct usb_interface *interface, 


	device_init_wakeup(&udev->dev, 1);

#ifdef CONFIG_PM

	pd->udev->autosuspend_delay = HZ * PM_SUSPEND_DELAY;

	pm_runtime_set_autosuspend_delay(&pd->udev->dev,

			1000 * PM_SUSPEND_DELAY);

	usb_enable_autosuspend(pd->udev);



	if (in_hibernation(pd)) {

drivers/net/wimax/i2400m/usb.c

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ int i2400mu_probe(struct usb_interface *iface, 
#ifdef CONFIG_PM

	iface->needs_remote_wakeup = 1;		/* autosuspend (15s delay) */

	device_init_wakeup(dev, 1);

	usb_dev->autosuspend_delay = 15 * HZ;

	pm_runtime_set_autosuspend_delay(&usb_dev->dev, 15000);

	usb_enable_autosuspend(usb_dev);

#endif

drivers/staging/bcm/InterfaceInit.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id) 
		if(psAdapter->bDoSuspend)

		{

#ifdef CONFIG_PM

			udev->autosuspend_delay = 0;

			pm_runtime_set_autosuspend_delay(&udev->dev, 0);

			intf->needs_remote_wakeup = 1;

#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)

 			udev->autosuspend_disabled = 0;