[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <47F3A9C3.7030702@rtr.ca>
Date: Wed, 02 Apr 2008 11:44:03 -0400
From: Mark Lord <lkml@....ca>
To: Alan Stern <stern@...land.harvard.edu>
Cc: Oliver Neukum <oliver@...kum.org>, Pavel Machek <pavel@...e.cz>,
Linux Kernel <linux-kernel@...r.kernel.org>,
Greg KH <gregkh@...e.de>,
Andrew Morton <akpm@...ux-foundation.org>, jikos@...e.cz,
linux-usb@...r.kernel.org
Subject: Re: 2.6.25-rc7: Ugh. ---> PATCH
This patch seems to fix it.
Could you guys look this over some more,
as I really am not familiar with the USB code.
* * * *
When comparing 2.6.24 against 2.6.25, this line of code
stood out as not looking entirely correct, given the new
uses of QH_STATE_UNLINK_WAIT in 2.6.25.
Applying this patch seems to fix the USB suspend/resume deaths
on my machine here. More testing is needed to be sure.
Signed-off-by: Mark Lord <mlord@...ox.com>
--- linux-2.6.25-rc8/drivers/usb/host/ehci-hcd.c 2008-03-11 11:18:40.000000000 -0400
+++ linux/drivers/usb/host/ehci-hcd.c 2008-04-02 11:36:13.000000000 -0400
@@ -815,7 +815,7 @@
end_unlink_async(ehci);
/* if it's not linked then there's nothing to do */
- if (qh->qh_state != QH_STATE_LINKED)
+ if (qh->qh_state != QH_STATE_LINKED && qh->qh_state != QH_STATE_UNLINK_WAIT)
;
/* defer till later if busy */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists