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

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

drivers/usb/host/xhci.h

+2 −2
Original line number Diff line number Diff line
@@ -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. */