diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-08-19 15:17:56 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-09-13 23:41:46 +0100 |
| commit | 498f060a17f9e4a6b655fdbdda6036f560bee4ac (patch) | |
| tree | f44fb2abab33b57640ebb5dcc14cc18b9c5f8aec /drivers/usb/host | |
| parent | 1bc6485405f05ff9912055c67b43fc86b183eec3 (diff) | |
| download | kernel_samsung_smdk4412-498f060a17f9e4a6b655fdbdda6036f560bee4ac.zip kernel_samsung_smdk4412-498f060a17f9e4a6b655fdbdda6036f560bee4ac.tar.gz kernel_samsung_smdk4412-498f060a17f9e4a6b655fdbdda6036f560bee4ac.tar.bz2 | |
xhci: Treat not finding the event_seg on COMP_STOP the same as COMP_STOP_INVAL
commit 9a54886342e227433aebc9d374f8ae268a836475 upstream.
When using a Renesas uPD720231 chipset usb-3 uas to sata bridge with a 120G
Crucial M500 ssd, model string: Crucial_ CT120M500SSD1, together with a
the integrated Intel xhci controller on a Haswell laptop:
00:14.0 USB controller [0c03]: Intel Corporation 8 Series USB xHCI HC [8086:9c31] (rev 04)
The following error gets logged to dmesg:
xhci error: Transfer event TRB DMA ptr not part of current TD
Treating COMP_STOP the same as COMP_STOP_INVAL when no event_seg gets found
fixes this.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index bc5ee84..fa2f7d3 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -2433,7 +2433,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, * last TRB of the previous TD. The command completion handle * will take care the rest. */ - if (!event_seg && trb_comp_code == COMP_STOP_INVAL) { + if (!event_seg && (trb_comp_code == COMP_STOP || + trb_comp_code == COMP_STOP_INVAL)) { ret = 0; goto cleanup; } |