diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-30 09:23:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-30 09:23:34 -0700 |
| commit | 2ae599781a4d11036e9aaf43890e51b33d573dea (patch) | |
| tree | 0061ebaaa017aa6c0189b6551ece3f61a1855271 | |
| parent | 8ab2055b3926acce31cafabe9f43242d489c291c (diff) | |
| download | patches-2ae599781a4d11036e9aaf43890e51b33d573dea.tar.gz | |
usb fix
| -rw-r--r-- | series | 2 | ||||
| -rw-r--r-- | usb/usb-remove-leftover-references-to-udev-autosuspend_disabled.patch | 45 |
2 files changed, 46 insertions, 1 deletions
@@ -243,6 +243,7 @@ usb/usb-mass-storage-gadget-handle-eject-request.patch usb/usb-sisusbvga-remove-the-bkl-from-open.patch usb/usb-mos7840-cleanup-useless-header.patch usb/usb-g_hid-unregister-platform-driver-on-probe-usb_composite_register-errors.patch +usb/usb-remove-leftover-references-to-udev-autosuspend_disabled.patch # this goes in last. @@ -255,4 +256,3 @@ usb/usb-remove-unused-usb_buffer_alloc-and-usb_buffer_free-macros.patch # new stuff is in the staging-next git tree on git.kernel.org - diff --git a/usb/usb-remove-leftover-references-to-udev-autosuspend_disabled.patch b/usb/usb-remove-leftover-references-to-udev-autosuspend_disabled.patch new file mode 100644 index 00000000000000..38adea321f9ac4 --- /dev/null +++ b/usb/usb-remove-leftover-references-to-udev-autosuspend_disabled.patch @@ -0,0 +1,45 @@ +From stern@rowland.harvard.edu Fri Apr 30 09:22:18 2010 +From: Alan Stern <stern@rowland.harvard.edu> +Date: Fri, 30 Apr 2010 12:14:04 -0400 (EDT) +Subject: USB: remove leftover references to udev->autosuspend_disabled +To: Greg KH <greg@kroah.com> +Cc: Stephen Rothwell <sfr@canb.auug.org.au> +Message-ID: <Pine.LNX.4.44L0.1004301211040.1535-100000@iolanthe.rowland.org> + + +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> + +--- + drivers/media/video/tlg2300/pd-main.c | 2 +- + drivers/net/wimax/i2400m/usb.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- 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_int + + 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); +--- 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->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); |