aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2010-11-17 10:56:01 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-17 16:24:47 -0500
commit2f15744c1d90ee2e82f8ae5724b44b1cdf31715c (patch)
tree4ac4be9a92e45b428bfbf4aaf39937c6f9a62bb5
parentaa02f172ac85f144d0baa248e27e34e165963f94 (diff)
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: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/media/video/tlg2300/pd-main.c3
-rw-r--r--drivers/net/wimax/i2400m/usb.c2
-rw-r--r--drivers/staging/bcm/InterfaceInit.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/tlg2300/pd-main.c b/drivers/media/video/tlg2300/pd-main.c
index 4555f4a5f4c..e33b428a801 100644
--- a/drivers/media/video/tlg2300/pd-main.c
+++ b/drivers/media/video/tlg2300/pd-main.c
@@ -453,7 +453,8 @@ static int poseidon_probe(struct usb_interface *interface,
453 453
454 device_init_wakeup(&udev->dev, 1); 454 device_init_wakeup(&udev->dev, 1);
455#ifdef CONFIG_PM 455#ifdef CONFIG_PM
456 pd->udev->autosuspend_delay = HZ * PM_SUSPEND_DELAY; 456 pm_runtime_set_autosuspend_delay(&pd->udev->dev,
457 1000 * PM_SUSPEND_DELAY);
457 usb_enable_autosuspend(pd->udev); 458 usb_enable_autosuspend(pd->udev);
458 459
459 if (in_hibernation(pd)) { 460 if (in_hibernation(pd)) {
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index d3365ac85dd..7cb375515e1 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -514,7 +514,7 @@ int i2400mu_probe(struct usb_interface *iface,
514#ifdef CONFIG_PM 514#ifdef CONFIG_PM
515 iface->needs_remote_wakeup = 1; /* autosuspend (15s delay) */ 515 iface->needs_remote_wakeup = 1; /* autosuspend (15s delay) */
516 device_init_wakeup(dev, 1); 516 device_init_wakeup(dev, 1);
517 usb_dev->autosuspend_delay = 15 * HZ; 517 pm_runtime_set_autosuspend_delay(&usb_dev->dev, 15000);
518 usb_enable_autosuspend(usb_dev); 518 usb_enable_autosuspend(usb_dev);
519#endif 519#endif
520 520
diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index 824f9a45007..e97ad99b1bb 100644
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -277,7 +277,7 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
277 if(psAdapter->bDoSuspend) 277 if(psAdapter->bDoSuspend)
278 { 278 {
279#ifdef CONFIG_PM 279#ifdef CONFIG_PM
280 udev->autosuspend_delay = 0; 280 pm_runtime_set_autosuspend_delay(&udev->dev, 0);
281 intf->needs_remote_wakeup = 1; 281 intf->needs_remote_wakeup = 1;
282#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) 282#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
283 udev->autosuspend_disabled = 0; 283 udev->autosuspend_disabled = 0;