From mboxrd@z Thu Jan 1 00:00:00 1970 From: sshtylyov@mvista.com (Sergei Shtylyov) Date: Wed, 09 May 2012 21:22:20 +0400 Subject: [PATCH] USB: ohci-at91: add a reset function to fix race condition In-Reply-To: <1336553334-31058-1-git-send-email-nicolas.ferre@atmel.com> References: <1336553334-31058-1-git-send-email-nicolas.ferre@atmel.com> Message-ID: <4FAAA7CC.7050208@mvista.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hello. On 09-05-2012 12:48, Nicolas Ferre wrote: > 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. > Signed-off-by: Nicolas Ferre > Tested-by: Christian Eggers > Cc: stable > --- > drivers/usb/host/ohci-at91.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > 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 '('. > { > 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. > +{ > + struct ohci_hcd *ohci = hcd_to_ohci (hcd); And here. WBR, Sergei