diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-09 13:06:13 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-09 13:06:13 -0400 |
| commit | ded737fe6a2fe5d18005e6e97e40e0d728a6619b (patch) | |
| tree | fc4bb067b8f73b620eb43c11111be144fd96823b /drivers/usb/host/xhci.h | |
| parent | 010ccce0fa6cc4b235e80bbc1ff1cb37c67984e7 (diff) | |
| parent | 50d0206fcaea3e736f912fd5b00ec6233fb4ce44 (diff) | |
Merge tag 'for-usb-linus-2012-08-08' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus
xHCI bug fixes and host quirks.
Hi Greg,
Here's four patches for 3.6. Most are marked for stable as well.
The first one makes the xHCI driver load properly on newer Rensas hosts.
The next two fix issues with the Etron host incorrectly marking short
transfers as successful, and avoiding log warning spam for hosts that
make the same mistake.
The last patch fixes a really nasty xHCI driver bug that could cause
general protection faults when devices stall transfers.
Sarah Sharp
Diffstat (limited to 'drivers/usb/host/xhci.h')
| -rw-r--r-- | drivers/usb/host/xhci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 55c0785810c9..96f49dbb50ac 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h | |||
| @@ -1537,6 +1537,8 @@ static inline struct usb_hcd *xhci_to_hcd(struct xhci_hcd *xhci) | |||
| 1537 | dev_err(xhci_to_hcd(xhci)->self.controller , fmt , ## args) | 1537 | dev_err(xhci_to_hcd(xhci)->self.controller , fmt , ## args) |
| 1538 | #define xhci_warn(xhci, fmt, args...) \ | 1538 | #define xhci_warn(xhci, fmt, args...) \ |
| 1539 | dev_warn(xhci_to_hcd(xhci)->self.controller , fmt , ## args) | 1539 | dev_warn(xhci_to_hcd(xhci)->self.controller , fmt , ## args) |
| 1540 | #define xhci_warn_ratelimited(xhci, fmt, args...) \ | ||
| 1541 | dev_warn_ratelimited(xhci_to_hcd(xhci)->self.controller , fmt , ## args) | ||
| 1540 | 1542 | ||
| 1541 | /* TODO: copied from ehci.h - can be refactored? */ | 1543 | /* TODO: copied from ehci.h - can be refactored? */ |
| 1542 | /* xHCI spec says all registers are little endian */ | 1544 | /* xHCI spec says all registers are little endian */ |