diff options
| author |   Felipe Balbi <balbi@ti.com> | 2012-03-15 16:37:08 +0200 |
|---|---|---|
| committer |   Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2012-04-11 08:28:37 -0700 |
| commit | 4e833c0b87a30798e67f06120cecebef6ee9644c (patch) | |
| tree | 9b6fb3df485609c9fff67703ec92551dee05ee07 /drivers/usb/host/xhci-ring.c | |
| parent | usb: xhci: fix section mismatch in linux-next (diff) | |
| download | linux-dev-4e833c0b87a30798e67f06120cecebef6ee9644c.tar.xz linux-dev-4e833c0b87a30798e67f06120cecebef6ee9644c.zip | |
xhci: don't re-enable IE constantly
While we're at that, define IMAN bitfield to aid readability.
The interrupt enable bit should be set once on driver init, and we
shouldn't need to continually re-enable it. Commit c21599a3 introduced
a read of the irq_pending register, and that allows us to preserve the
state of the IE bit. Before that commit, we were blindly writing 0x3 to
the register.
This patch should be backported to kernels as old as 2.6.36, or ones
that contain the commit c21599a36165dbc78b380846b254017a548b9de5 "USB:
xhci: Reduce reads and writes of interrupter registers".
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/usb/host/xhci-ring.c')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 6bd9d53062eb..5ddc4ae85499 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -2417,7 +2417,7 @@ hw_died: u32 irq_pending; /* Acknowledge the PCI interrupt */ irq_pending = xhci_readl(xhci, &xhci->ir_set->irq_pending); - irq_pending |= 0x3; + irq_pending |= IMAN_IP; xhci_writel(xhci, irq_pending, &xhci->ir_set->irq_pending); } |