Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[pandora-kernel.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 c267e0c..256cc55 100644 (file)
--- a/drivers/media/video/tlg2300/pd-main.c
+++ b/drivers/media/video/tlg2300/pd-main.c
@@ -454,8 +454,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);