diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-11 12:15:55 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-11 12:15:55 +0800 |
| commit | e01035c1a71d7cceebc3df92f79577df7438523a (patch) | |
| tree | f745442c513b343e0a5d8fc84c4c0eb6603ec7b2 /drivers/usb | |
| parent | da9a92f0cde9ce34a930d7edcaef30429e41d14a (diff) | |
| parent | 3d27bcb804a6889e8f16daf95751764907f1e100 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ohci-q.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c index d029bbe9eb36..641fed609911 100644 --- a/drivers/usb/host/ohci-q.c +++ b/drivers/usb/host/ohci-q.c @@ -183,7 +183,6 @@ static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed) { int branch; - ed->state = ED_OPER; ed->ed_prev = NULL; ed->ed_next = NULL; ed->hwNextED = 0; @@ -259,6 +258,8 @@ static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed) /* the HC may not see the schedule updates yet, but if it does * then they'll be properly ordered. */ + + ed->state = ED_OPER; return 0; } |