diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 08:16:52 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 08:16:52 +0400 |
| commit | 70d002bccac5e107fafb95e83fcb7fc010a88695 (patch) | |
| tree | 58607b980731b3ac418693a1d511630f482564c1 /drivers/usb/host/ehci-hcd.c | |
| parent | 7f0852f959d8e92786c684ebd7fee3332a2f4efe (diff) | |
| parent | a969888ce91673c7f4b86520d851a6f0d5a5fa7d (diff) | |
| download | linux-70d002bccac5e107fafb95e83fcb7fc010a88695.tar.xz | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 of HEAD
* HEAD: (44 commits)
[PATCH] USB: move usb-serial.h to include/linux/usb/
[PATCH] USB: Anydata: Fixes wrong URB callback.
[PATCH] USB: gadget section fixups
[PATCH] USB: another unusual device
[PATCH] USB: Add one VID/PID to ftdi_sio
[PATCH] USB: unusual_devs entry for Sony DSC-H5
[PATCH] USB: unusual_devs entry for Nokia E61
[PATCH] USB: unusual_devs entry for Nokia N91
[PATCH] USB: add ZyXEL vendor/product ID to rtl8150 driver
[PATCH] USB: Option driver: new product ID
[PATCH] USB: add support for WiseGroup., Ltd SmartJoy Dual PLUS Adapter
[PATCH] USB: ipw.c driver fix
[PATCH] USB: remove devfs information from Kconfig
[PATCH] USB: remove empty destructor from drivers/usb/mon/mon_text.c
[PATCH] USB: ipaq.c timing parameters
[PATCH] USB: ipaq.c bugfixes
[PATCH] USB: ehci: fix bogus alteration of a local variable
[PATCH] USB: add driver for non-composite Sierra Wireless devices
[PATCH] USB: fix pointer dereference in drivers/usb/misc/usblcd
[PATCH] USB: Kill compiler warning in quirk_usb_handoff_ohci
...
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index cee6f538de0a..85b0b4ad4c16 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -625,10 +625,11 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd, struct pt_regs *regs) writel (status | CMD_RUN, &ehci->regs->command); while (i--) { - status = readl (&ehci->regs->port_status [i]); - if (status & PORT_OWNER) + int pstatus = readl (&ehci->regs->port_status [i]); + + if (pstatus & PORT_OWNER) continue; - if (!(status & PORT_RESUME) + if (!(pstatus & PORT_RESUME) || ehci->reset_done [i] != 0) continue; |