diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-18 23:56:05 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-18 23:56:05 +0100 |
| commit | 2726e202f7f54e69f95948f5015d39840c47e1b6 (patch) | |
| tree | 5d98d5c4bec3fb3e014e77204b68430a3e99e9a8 | |
| parent | USB: EHCI: fix regression during bus resume (diff) | |
| parent | USB: xhci - fix bit definitions for IMAN register (diff) | |
| download | linux-2726e202f7f54e69f95948f5015d39840c47e1b6.tar.xz linux-2726e202f7f54e69f95948f5015d39840c47e1b6.zip | |
Merge tag 'for-usb-linus-2013-03-18' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus
Sarah writes:
xHCI bug fix for 3.9
Hi Greg,
Here's one xHCI bug fix. We had two register bits flipped.
Sarah Sharp
| -rw-r--r-- | drivers/usb/host/xhci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index f791bd0aee6c..2c510e4a7d4c 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -206,8 +206,8 @@ struct xhci_op_regs { /* bits 12:31 are reserved (and should be preserved on writes). */ /* IMAN - Interrupt Management Register */ -#define IMAN_IP (1 << 1) -#define IMAN_IE (1 << 0) +#define IMAN_IE (1 << 1) +#define IMAN_IP (1 << 0) /* USBSTS - USB status - status bitmasks */ /* HC not running - set to 1 when run/stop bit is cleared. */ |