This is a note to let you know that I've just added the patch titled
Subject: USB: EHCI: move del_timer_sync calls outside spinlocked region
to my gregkh-2.6 tree. Its filename is
usb-ehci-move-del_timer_sync-calls-outside-spinlocked-region.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
>From [EMAIL PROTECTED] Fri Jan 11 17:14:04 2008
From: Alan Stern <[EMAIL PROTECTED]>
Date: Thu, 10 Jan 2008 16:43:15 -0500 (EST)
Subject: USB: EHCI: move del_timer_sync calls outside spinlocked region
To: Greg KH <[EMAIL PROTECTED]>
Cc: David Brownell <[EMAIL PROTECTED]>, USB list <linux-usb@vger.kernel.org>
Message-ID: <[EMAIL PROTECTED]>
This patch (as1030b) moves a del_timer_sync() call outside the scope of a
spinlock, where it could cause a deadlock, and adds a new
del_timer_sync() call for the new IAA watchdog timer (it was omitted
by mistake).
Signed-off-by: Alan Stern <[EMAIL PROTECTED]>
Acked-by: David Brownell <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
drivers/usb/host/ehci-hub.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -123,6 +123,8 @@ static int ehci_bus_suspend (struct usb_
if (time_before (jiffies, ehci->next_statechange))
msleep(5);
+ del_timer_sync(&ehci->watchdog);
+ del_timer_sync(&ehci->iaa_watchdog);
port = HCS_N_PORTS (ehci->hcs_params);
spin_lock_irq (&ehci->lock);
@@ -171,7 +173,6 @@ static int ehci_bus_suspend (struct usb_
}
/* turn off now-idle HC */
- del_timer_sync (&ehci->watchdog);
ehci_halt (ehci);
hcd->state = HC_STATE_SUSPENDED;
Patches currently in gregkh-2.6 which might be from [EMAIL PROTECTED] are
driver/pm-acquire-device-locks-prior-to-suspending.patch
driver/kobject-drop-child-parent-ref-at-unregistration.patch
driver/driver-core-fix-race-in-__device_release_driver.patch
driver/driver-core-fix-class-glue-dir-cleanup-logic.patch
usb/usb-add-usbfs-stubs-for-suspend-and-resume.patch
usb/usb-dummy_hcd-change-the-default-power-budget.patch
usb/usb-usb-storage-new-lockable-subclass-0x07.patch
usb/usb-ehci-add-separate-iaa-watchdog-timer.patch
usb/usb-usb-mon-mon_bin.c-cleanups.patch
usb/usb-autosuspend-for-cdc-acm.patch
usb/usb-repair-usbdevfs_connect-ioctl.patch
usb/usb-don-t-change-hc-power-state-for-a-freeze.patch
usb/usb-dummy_hcd-don-t-register-drivers-on-the-platform-bus.patch
usb/usb-force-handover-port-to-companion-when-hub_port_connect_change-fails.patch
usb/usb-make-ksuspend_usbd-thread-non-freezable.patch
usb/usb-updates-to-usb_reset_composite_device.patch
usb/usb-ehci-add-a-short-delay-to-the-bus_suspend-routine.patch
usb/usb-ehci-move-del_timer_sync-calls-outside-spinlocked-region.patch
-
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
