The patch titled
ehci: fix bogus alteration of a local variable
has been removed from the -mm tree. Its filename is
ehci-fix-bogus-alteration-of-a-local-variable.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ehci: fix bogus alteration of a local variable
From: David Brownell <david-b@xxxxxxxxxxx>
In a rare and all-but-unused path, the EHCI driver could reuse a variable
in a way that'd make trouble. Specifically, if the first root hub port
gets an overcurrent event (rare) during a remote wakeup scenario (all but
unused in today's Linux, except for folk working with suspend-to-RAM and
similar sleep states), that would look like a fatal error which would shut
down the controller. Fix by not reusing that variable.
Spotted by Per Hallsmark <saxofon@xxxxxxxxxx>
Fixes http://bugzilla.kernel.org/show_bug.cgi?id=6661
Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/usb/host/ehci-hcd.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff -puN drivers/usb/host/ehci-hcd.c~ehci-fix-bogus-alteration-of-a-local-variable drivers/usb/host/ehci-hcd.c
--- a/drivers/usb/host/ehci-hcd.c~ehci-fix-bogus-alteration-of-a-local-variable
+++ a/drivers/usb/host/ehci-hcd.c
@@ -626,10 +626,11 @@ static irqreturn_t ehci_irq (struct usb_
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;
_
Patches currently in -mm which might be from david-b@xxxxxxxxxxx are
origin.patch
fix-broken-dubious-driver-suspend-methods.patch
pm-define-pm_event_prethaw.patch
pm-pci-and-ide-handle-pm_event_prethaw.patch
pm-video-drivers-and-pm_event_prethaw.patch
pm-usb-hcds-use-pm_event_prethaw.patch
pm-issue-pm_event_prethaw.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
