linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH][2.4-ac] trivial ohci fixes
@ 2002-09-10 17:26 Zwane Mwaikambo
  2002-09-12 22:43 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: Zwane Mwaikambo @ 2002-09-10 17:26 UTC (permalink / raw)
  To: Greg Kroah-Hartmann; +Cc: Alan Cox, Linux Kernel

Hi Greg, Alan,
	This is just a trivial patch for the following, and also a 
buglet (clear_bit usb_register/derister race there?) fix

usb-uhci.c: $Revision: 1.1.1.1 $ time 21:43:25 Sep  8 2002
usb-uhci.c: High bandwidth mode enabled
usb-uhci.c: v1.275:USB Universal Host Controller Interface driver
usb-ohci.c: USB OHCI at membase 0xd0012000, IRQ 11
usb-ohci.c: usb-00:01.2, Silicon Integrated Systems [SiS] 7001
usb-ohci.c: USB HC TakeOver failed!
usb.c: USB bus -1 deregistered <--

Index: linux-2.4.20-pre5-ac4/drivers/usb//usb-ohci.c
===================================================================
RCS file: /build/cvsroot/linux-2.4.20-pre5-ac4/drivers/usb/usb-ohci.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 usb-ohci.c
--- linux-2.4.20-pre5-ac4/drivers/usb//usb-ohci.c	8 Sep 2002 18:05:41 -0000	1.1.1.1
+++ linux-2.4.20-pre5-ac4/drivers/usb//usb-ohci.c	8 Sep 2002 21:28:56 -0000
@@ -2440,8 +2440,9 @@
 	}
 	pci_set_drvdata(ohci->ohci_dev, NULL);
 	if (ohci->bus) {
-		if (ohci->bus->busnum)
+		if (ohci->bus->busnum != -1)
 			usb_deregister_bus (ohci->bus);
+
 		usb_free_bus (ohci->bus);
 	}
 
Index: linux-2.4.20-pre5-ac4/drivers/usb//usb.c
===================================================================
RCS file: /build/cvsroot/linux-2.4.20-pre5-ac4/drivers/usb/usb.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 usb.c
--- linux-2.4.20-pre5-ac4/drivers/usb//usb.c	8 Sep 2002 18:05:41 -0000	1.1.1.1
+++ linux-2.4.20-pre5-ac4/drivers/usb//usb.c	8 Sep 2002 19:24:48 -0000
@@ -457,11 +457,10 @@
 	 */
 	down (&usb_bus_list_lock);
 	list_del(&bus->bus_list);
+	clear_bit(bus->busnum, busmap.busmap);
 	up (&usb_bus_list_lock);
 
 	usbdevfs_remove_bus(bus);
-
-	clear_bit(bus->busnum, busmap.busmap);
 
 	usb_bus_put(bus);
 }

-- 
function.linuxpower.ca


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH][2.4-ac] trivial ohci fixes
  2002-09-10 17:26 [PATCH][2.4-ac] trivial ohci fixes Zwane Mwaikambo
@ 2002-09-12 22:43 ` Greg KH
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2002-09-12 22:43 UTC (permalink / raw)
  To: Zwane Mwaikambo; +Cc: Alan Cox, Linux Kernel

On Tue, Sep 10, 2002 at 07:26:17PM +0200, Zwane Mwaikambo wrote:
> Hi Greg, Alan,
> 	This is just a trivial patch for the following, and also a 
> buglet (clear_bit usb_register/derister race there?) fix

Applied to my tree, thanks.

greg k-h

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2002-09-12 22:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-09-10 17:26 [PATCH][2.4-ac] trivial ohci fixes Zwane Mwaikambo
2002-09-12 22:43 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).