Re: 2.6.25-rc7: Ugh. ---> PATCH

Alan Stern
2008-04-02T20:10:13Z

On Wed, 2 Apr 2008, Mark Lord wrote:

> 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.

> --- 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 answer your implied question...

QH_STATE_UNLINK_WAIT doesn't have a new meaning in 2.6.25. Just as
before, it means that qh is on a queue waiting to be unlinked.

qh->qh_state can never be equal to QH_STATE_UNLINK_WAIT at this point.
If it were, it would mean that some part of the driver had tried to
unlink qh twice. But even then, the correct move would be to follow
the "nothing to do" path -- since qh is already waiting to be unlinked,
there's no point trying to do any more.

Alan Stern