Commit 2726e202 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'for-usb-linus-2013-03-18' of...

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
parents 2a40f324 f8264340
...@@ -206,8 +206,8 @@ struct xhci_op_regs { ...@@ -206,8 +206,8 @@ struct xhci_op_regs {
/* bits 12:31 are reserved (and should be preserved on writes). */ /* bits 12:31 are reserved (and should be preserved on writes). */
/* IMAN - Interrupt Management Register */ /* IMAN - Interrupt Management Register */
#define IMAN_IP (1 << 1) #define IMAN_IE (1 << 1)
#define IMAN_IE (1 << 0) #define IMAN_IP (1 << 0)
/* USBSTS - USB status - status bitmasks */ /* USBSTS - USB status - status bitmasks */
/* HC not running - set to 1 when run/stop bit is cleared. */ /* HC not running - set to 1 when run/stop bit is cleared. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment