projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'usb-next' into musb-merge
[linux-2.6-block.git]
/
drivers
/
media
/
video
/
tlg2300
/
pd-main.c
diff --git
a/drivers/media/video/tlg2300/pd-main.c
b/drivers/media/video/tlg2300/pd-main.c
index c91424c0c1353565f4f599004c46b81d5eaa83bd..99c81a9a4f46bb6dc1b95e7f98190798c5f79fbc 100644
(file)
--- a/
drivers/media/video/tlg2300/pd-main.c
+++ b/
drivers/media/video/tlg2300/pd-main.c
@@
-452,7
+452,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)) {