[adm5120] enable switch driver for 2.6.24
[openwrt-10.03/.git] / target / linux / adm5120 / patches-2.6.24 / 912-usb_use_urb_unlinked_field.patch
1 Index: linux-2.6.24/drivers/usb/host/adm5120-q.c
2 ===================================================================
3 --- linux-2.6.24.orig/drivers/usb/host/adm5120-q.c
4 +++ linux-2.6.24/drivers/usb/host/adm5120-q.c
5 @@ -616,8 +616,7 @@ static int td_done(struct admhcd *ahcd, 
6  
7                 if (cc != TD_CC_NOERROR && cc < TD_CC_HCD0) {
8                         spin_lock(&urb->lock);
9 -                       if (urb->status == -EINPROGRESS)
10 -                               urb->status = cc_to_error[cc];
11 +                       urb->status = cc_to_error[cc];
12                         spin_unlock(&urb->lock);
13                 }
14  
15 @@ -787,7 +786,7 @@ rescan_this:
16                         urb = td->urb;
17                         urb_priv = td->urb->hcpriv;
18  
19 -                       if (urb->status == -EINPROGRESS) {
20 +                       if (!urb->unlinked) {
21                                 prev = &td->hwNextTD;
22                                 continue;
23                         }