Re: [PATCH 2/2] usb: musb: fix bug - should call usb_hcd_unlink_urb_from_ep before usb_hcd_giveback_urb

[Bryan Wu]

This patch was posted by Ajay. Please ignore it.

-Bryan

On Mon, Aug 25, 2008 at 5:13 PM, Bryan Wu <cooloney@xxxxxxxxxx> wrote:
> 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&tracker_item_id=4265
>
> __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@xxxxxxxxxx>
> ---
>  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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/