patch-2.4.6 linux/drivers/usb/uhci.c

• Lines: 48
• Date: Tue Jun 12 17:03:01 2001
• Orig file: v2.4.5/linux/drivers/usb/uhci.c
• Orig date: Mon May 21 15:02:06 2001

diff -u --recursive --new-file v2.4.5/linux/drivers/usb/uhci.c linux/drivers/usb/uhci.c
@@ -425,8 +425,7 @@
 
 	/* Only go through the hoops if it's actually linked in */
 	if (list_empty(&qh->list)) {
-		uhci_free_qh(uhci, qh);
-		return;
+		goto list;
 	}
 
 	qh->urbp = NULL;
@@ -444,6 +443,7 @@
 
 	spin_unlock_irqrestore(&uhci->frame_list_lock, flags);
 
+list:
 	spin_lock_irqsave(&uhci->qh_remove_list_lock, flags);
 
 	/* Check to see if the remove list is empty. Set the IOC bit */
@@ -2922,15 +2922,17 @@
 }
 
 #ifdef CONFIG_PM
-static void uhci_pci_suspend(struct pci_dev *dev)
+static int uhci_pci_suspend(struct pci_dev *dev, u32 state)
 {
 	reset_hc((struct uhci *) dev->driver_data);
+	return 0;
 }
 
-static void uhci_pci_resume(struct pci_dev *dev)
+static int uhci_pci_resume(struct pci_dev *dev)
 {
 	reset_hc((struct uhci *) dev->driver_data);
 	start_hc((struct uhci *) dev->driver_data);
+	return 0;
 }
 #endif
 
@@ -2990,8 +2992,7 @@
 	if (retval)
 		goto init_failed;
 
-	info(DRIVER_VERSION " " DRIVER_AUTHOR);
-	info(DRIVER_DESC);
+	info(DRIVER_VERSION ":" DRIVER_DESC);
 
 	return 0;