> This bug was found on Blackfin BF54x and BF52x board since kernel 2.6.24 USB API change
>
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tr...
>
> __musb_giveback is called by not only musb_giveback but also musb_urb_dequeue.
> musb_urb_dequeue also need call usb_hcd_unlink_urb_from_ep before usb_hcd_giveback_urb.
>
> So move usb_hcd_unlink_urb_from_ep from musb_giveback to __musb_giveback to fix this bug.
>
> Signed-off-by: Bryan Wu <cooloney@kernel.org>
> ---
> drivers/usb/musb/musb_host.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
> index 8b4be01..ba98ac5 100644
> --- a/drivers/usb/musb/musb_host.c
> +++ b/drivers/usb/musb/musb_host.c
> @@ -291,6 +291,8 @@ __acquires(musb->lock)
> urb->actual_length, urb->transfer_buffer_length
> );
>
> + usb_hcd_unlink_urb_from_ep(musb_to_hcd(musb), urb);
> +
> spin_unlock(&musb->lock);
> usb_hcd_giveback_urb(musb_to_hcd(musb), urb, status);
> spin_lock(&musb->lock);
> @@ -353,8 +355,6 @@ musb_giveback(struct musb_qh *qh, struct urb *urb, int status)
> break;
> }
>
> - usb_hcd_unlink_urb_from_ep(musb_to_hcd(musb), urb);
> -
> qh->is_ready = 0;
> __musb_giveback(musb, urb, status);
> qh->is_ready = ready;
> --
> 1.5.6
>
