Commit:     2fa45a4cffd0c4ab4e238e8ad3b4f9b0c10ac1f3
Parent:     3cd709866f639d24b0d0f38567c19662c98ea92e
Author:     Alan Stern <[EMAIL PROTECTED]>
AuthorDate: Wed May 30 11:11:12 2007 -0400
Committer:  Jiri Kosina <[EMAIL PROTECTED]>
CommitDate: Mon Jul 9 14:13:30 2007 +0200

    USB HID: avoid flush_scheduled_work()
    This patch (as914) replaces a call to flush_scheduled_work() with
    cancel_work_sync(), in order to help avoid potential deadlocks.
    Signed-off-by: Alan Stern <[EMAIL PROTECTED]>
    Signed-off-by: Jiri Kosina <[EMAIL PROTECTED]>
 drivers/hid/usbhid/hid-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index d91b9da..093abb5 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -956,7 +956,7 @@ static void hid_disconnect(struct usb_interface *intf)
-       flush_scheduled_work();
+       cancel_work_sync(&usbhid->reset_work);
        if (hid->claimed & HID_CLAIMED_INPUT)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to