Thread (4 messages) 4 messages, 3 authors, 2012-05-10

[PATCH] USB: ohci-at91: add a reset function to fix race condition

From: Nicolas Ferre <hidden>
Date: 2012-05-10 07:39:04
Also in: lkml, stable

On 05/09/2012 07:22 PM, Sergei Shtylyov :
Hello.

On 09-05-2012 12:48, Nicolas Ferre wrote:
quoted
A possible race condition appears because we are not initializing
the ohci->regs before calling usb_hcd_request_irqs().
We move the call to ohci_init() in hcd->driver->reset() instead of
hcd->driver->start() to fix this.
This was experienced when we share the same IRQ line between OHCI and
EHCI
controllers.
quoted
Signed-off-by: Nicolas Ferre<redacted>
Tested-by: Christian Eggers<redacted>
Cc: stable<redacted>
---
  drivers/usb/host/ohci-at91.c |   11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
quoted
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 13ebeca..55d3d64 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -223,7 +223,7 @@ static void __devexit usb_hcd_at91_remove(struct
usb_hcd *hcd,
 
/*-------------------------------------------------------------------------*/


  static int __devinit
-ohci_at91_start (struct usb_hcd *hcd)
+ohci_at91_reset (struct usb_hcd *hcd)
   Have you run the patch thru scripts/checkpatch.pl? There should be no
space between function name and '('.
quoted
  {
      struct at91_usbh_data    *board =
hcd->self.controller->platform_data;
      struct ohci_hcd        *ohci = hcd_to_ohci (hcd);
@@ -233,6 +233,14 @@ ohci_at91_start (struct usb_hcd *hcd)
          return ret;

      ohci->num_ports = board->ports;
+    return 0;
+}
+
+static int __devinit
+ohci_at91_start (struct usb_hcd *hcd)
   Same here.
quoted
+{
+    struct ohci_hcd        *ohci = hcd_to_ohci (hcd);
   And here.
Yes, I have run checkpatch.pl. But I also know that I have to conform to
existing code and the history of the file that I am touching.
This file is using this convention as well as
drivers/usb/host/ohci-hcd.c and several others dealing with USB. So I
kept this style in my patch.

Best regards,
-- 
Nicolas Ferre
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help