iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: fix leftover references to udev->autosuspend_delay

Browse Source 
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: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern 2010-11-17 10:56:01 -05:00 committed by Greg Kroah-Hartman
parent aa02f172ac
commit 2f15744c1d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/video/tlg2300/pd-main.c
View File

@ -453,7 +453,8 @@ static int poseidon_probe(struct usb_interface *interface,
device_init_wakeup(&udev->dev, 1); device_init_wakeup(&udev->dev, 1);
#ifdef CONFIG_PM #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); usb_enable_autosuspend(pd->udev);
if (in_hibernation(pd)) { if (in_hibernation(pd)) {

2
drivers/net/wimax/i2400m/usb.c
View File

@ -514,7 +514,7 @@ int i2400mu_probe(struct usb_interface *iface,
#ifdef CONFIG_PM #ifdef CONFIG_PM
iface->needs_remote_wakeup = 1; /* autosuspend (15s delay) */ iface->needs_remote_wakeup = 1; /* autosuspend (15s delay) */
device_init_wakeup(dev, 1); 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); usb_enable_autosuspend(usb_dev);
#endif #endif

2
drivers/staging/bcm/InterfaceInit.c
View File

@ -277,7 +277,7 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
if(psAdapter->bDoSuspend) if(psAdapter->bDoSuspend)
{ {
#ifdef CONFIG_PM #ifdef CONFIG_PM
udev->autosuspend_delay = 0; pm_runtime_set_autosuspend_delay(&udev->dev, 0);
intf->needs_remote_wakeup = 1; intf->needs_remote_wakeup = 1;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
udev->autosuspend_disabled = 0; udev->autosuspend_disabled = 0;