aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/tlg2300/pd-main.c2
-rw-r--r--drivers/net/wimax/i2400m/usb.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/tlg2300/pd-main.c b/drivers/media/video/tlg2300/pd-main.c
index 2cf0ebf9f28b..a6400dad12ae 100644
--- a/drivers/media/video/tlg2300/pd-main.c
+++ b/drivers/media/video/tlg2300/pd-main.c
@@ -455,8 +455,8 @@ static int poseidon_probe(struct usb_interface *interface,
455 455
456 device_init_wakeup(&udev->dev, 1); 456 device_init_wakeup(&udev->dev, 1);
457#ifdef CONFIG_PM 457#ifdef CONFIG_PM
458 pd->udev->autosuspend_disabled = 0;
459 pd->udev->autosuspend_delay = HZ * PM_SUSPEND_DELAY; 458 pd->udev->autosuspend_delay = HZ * PM_SUSPEND_DELAY;
459 usb_enable_autosuspend(pd->udev);
460 460
461 if (in_hibernation(pd)) { 461 if (in_hibernation(pd)) {
462 INIT_WORK(&pd->pm_work, hibernation_resume); 462 INIT_WORK(&pd->pm_work, hibernation_resume);
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index d8c4d6497fdf..d555e37a665c 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -505,7 +505,7 @@ int i2400mu_probe(struct usb_interface *iface,
505 iface->needs_remote_wakeup = 1; /* autosuspend (15s delay) */ 505 iface->needs_remote_wakeup = 1; /* autosuspend (15s delay) */
506 device_init_wakeup(dev, 1); 506 device_init_wakeup(dev, 1);
507 usb_dev->autosuspend_delay = 15 * HZ; 507 usb_dev->autosuspend_delay = 15 * HZ;
508 usb_dev->autosuspend_disabled = 0; 508 usb_enable_autosuspend(usb_dev);
509#endif 509#endif
510 510
511 result = i2400m_setup(i2400m, I2400M_BRI_MAC_REINIT); 511 result = i2400m_setup(i2400m, I2400M_BRI_MAC_REINIT);