소스 검색

USB: remove leftover references to udev->autosuspend_disabled

This patch (as1373) fixes a couple of drivers outside the USB
subtree.  Devices are now disabled or enabled for autosuspend by
calling a core function instead of setting a flag.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Stern 15 년 전
부모
커밋
beb7b04a09
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      drivers/media/video/tlg2300/pd-main.c
  2. 1 1
      drivers/net/wimax/i2400m/usb.c

+ 1 - 1
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);
 	device_init_wakeup(&udev->dev, 1);
 #ifdef CONFIG_PM
 #ifdef CONFIG_PM
-	pd->udev->autosuspend_disabled = 0;
 	pd->udev->autosuspend_delay = HZ * PM_SUSPEND_DELAY;
 	pd->udev->autosuspend_delay = HZ * PM_SUSPEND_DELAY;
+	usb_enable_autosuspend(pd->udev);
 
 
 	if (in_hibernation(pd)) {
 	if (in_hibernation(pd)) {
 		INIT_WORK(&pd->pm_work, hibernation_resume);
 		INIT_WORK(&pd->pm_work, hibernation_resume);

+ 1 - 1
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) */
 	iface->needs_remote_wakeup = 1;		/* autosuspend (15s delay) */
 	device_init_wakeup(dev, 1);
 	device_init_wakeup(dev, 1);
 	usb_dev->autosuspend_delay = 15 * HZ;
 	usb_dev->autosuspend_delay = 15 * HZ;
-	usb_dev->autosuspend_disabled = 0;
+	usb_enable_autosuspend(usb_dev);
 #endif
 #endif
 
 
 	result = i2400m_setup(i2400m, I2400M_BRI_MAC_REINIT);
 	result = i2400m_setup(i2400m, I2400M_BRI_MAC_REINIT);