patch-2.4.13 linux/drivers/usb/usb.c

• Lines: 83
• Date: Sat Oct 20 19:13:11 2001
• Orig file: v2.4.12/linux/drivers/usb/usb.c
• Orig date: Tue Oct 9 17:06:53 2001

diff -u --recursive --new-file v2.4.12/linux/drivers/usb/usb.c linux/drivers/usb/usb.c
@@ -60,7 +60,7 @@
  */
 LIST_HEAD(usb_driver_list);
 LIST_HEAD(usb_bus_list);
-rwlock_t usb_bus_list_lock = RW_LOCK_UNLOCKED;
+struct semaphore usb_bus_list_lock;
 
 devfs_handle_t usb_devfs_handle;	/* /dev/usb dir. */
 
@@ -112,7 +112,7 @@
 {
 	struct list_head *tmp;
 
-	read_lock_irq (&usb_bus_list_lock);
+	down (&usb_bus_list_lock);
 	tmp = usb_bus_list.next;
 	while (tmp != &usb_bus_list) {
 		struct usb_bus *bus = list_entry(tmp,struct usb_bus, bus_list);
@@ -120,7 +120,7 @@
 		tmp = tmp->next;
 		usb_check_support(bus->root_hub);
 	}
-	read_unlock_irq (&usb_bus_list_lock);
+	up (&usb_bus_list_lock);
 }
 
 /*
@@ -182,7 +182,7 @@
 	 */
 	list_del(&driver->driver_list);
 
-	read_lock_irq (&usb_bus_list_lock);
+	down (&usb_bus_list_lock);
 	tmp = usb_bus_list.next;
 	while (tmp != &usb_bus_list) {
 		struct usb_bus *bus = list_entry(tmp,struct usb_bus,bus_list);
@@ -190,7 +190,7 @@
 		tmp = tmp->next;
 		usb_drivers_purge(driver, bus->root_hub);
 	}
-	read_unlock_irq (&usb_bus_list_lock);
+	up (&usb_bus_list_lock);
 }
 
 struct usb_interface *usb_ifnum_to_if(struct usb_device *dev, unsigned ifnum)
@@ -421,7 +421,7 @@
 {
 	int busnum;
 
-	write_lock_irq (&usb_bus_list_lock);
+	down (&usb_bus_list_lock);
 	busnum = find_next_zero_bit(busmap.busmap, USB_MAXBUS, 1);
 	if (busnum < USB_MAXBUS) {
 		set_bit(busnum, busmap.busmap);
@@ -433,7 +433,7 @@
 
 	/* Add it to the list of buses */
 	list_add(&bus->bus_list, &usb_bus_list);
-	write_unlock_irq (&usb_bus_list_lock);
+	up (&usb_bus_list_lock);
 
 	usbdevfs_add_bus(bus);
 
@@ -455,9 +455,9 @@
 	 * controller code, as well as having it call this when cleaning
 	 * itself up
 	 */
-	write_lock_irq (&usb_bus_list_lock);
+	down (&usb_bus_list_lock);
 	list_del(&bus->bus_list);
-	write_unlock_irq (&usb_bus_list_lock);
+	up (&usb_bus_list_lock);
 
 	usbdevfs_remove_bus(bus);
 
@@ -2332,6 +2332,7 @@
  */
 static int __init usb_init(void)
 {
+	init_MUTEX(&usb_bus_list_lock);
 	usb_major_init();
 	usbdevfs_init();
 	usb_hub_init();