From 9446edcc8ce268e5a19ddebf8742c42fece65f15 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Fri, 30 Apr 2010 12:14:04 -0400 Subject: [PATCH] --- yaml --- r: 195415 b: refs/heads/master c: beb7b04a09a9da8b12417f7b74fbcceedb087fc3 h: refs/heads/master i: 195413: 2f0f155dc62a8b5a7e0df71c50b994232f557b60 195411: 2c883f0f0aee4f9dd9ff254fd86c8e80492acfaf 195407: afcd3c48878169ae40cf91cd5a2524ad1fc42903 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tlg2300/pd-main.c | 2 +- trunk/drivers/net/wimax/i2400m/usb.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 119e2b1dec7a..d902fe2bdc81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da01c7a49bfc94dbfa66af5ca5e1063b10bc6a10 +refs/heads/master: beb7b04a09a9da8b12417f7b74fbcceedb087fc3 diff --git a/trunk/drivers/media/video/tlg2300/pd-main.c b/trunk/drivers/media/video/tlg2300/pd-main.c index 2cf0ebf9f28b..a6400dad12ae 100644 --- a/trunk/drivers/media/video/tlg2300/pd-main.c +++ b/trunk/drivers/media/video/tlg2300/pd-main.c @@ -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); diff --git a/trunk/drivers/net/wimax/i2400m/usb.c b/trunk/drivers/net/wimax/i2400m/usb.c index d8c4d6497fdf..d555e37a665c 100644 --- a/trunk/drivers/net/wimax/i2400m/usb.c +++ b/trunk/drivers/net/wimax/i2400m/usb.c @@ -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);