diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /drivers/usb/uhci.c | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'drivers/usb/uhci.c')
| -rw-r--r-- | drivers/usb/uhci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/uhci.c b/drivers/usb/uhci.c index b45826937..4c82d50b5 100644 --- a/drivers/usb/uhci.c +++ b/drivers/usb/uhci.c @@ -156,7 +156,8 @@ static int uhci_td_result(struct uhci_device *dev, struct uhci_td *td, unsigned if (rval) *rval += actlength; - if (explength != actlength && tmp->pipetype == PIPE_BULK) { + if (explength != actlength && + ((tmp->pipetype == PIPE_BULK) || (tmp->pipetype == PIPE_CONTROL))) { /* If the packet is short, none of the */ /* packets after this were processed, so */ /* fix the DT accordingly */ |