patch-2.3.22 linux/drivers/usb/ohci.c

Next file: linux/drivers/usb/printer.c
Previous file: linux/drivers/usb/ohci-hcd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.21/linux/drivers/usb/ohci.c linux/drivers/usb/ohci.c
@@ -24,7 +24,7 @@
  *
  * No filesystems were harmed in the development of this code.
  *
- * $Id: ohci.c,v 1.77 1999/09/16 04:30:19 greg Exp $
+ * $Id: ohci.c,v 1.80 1999/09/30 06:32:17 greg Exp $
  */
 
 #include <linux/config.h>
@@ -941,7 +941,7 @@
  * interrupt.  (It's really a pointer to the TD).
  */
 static int ohci_request_irq(struct usb_device *usb, unsigned int pipe,
-	usb_device_irq handler, int period, void *dev_id, void **handle)
+	usb_device_irq handler, int period, void *dev_id, void **handle, long bustime)
 {
 	struct ohci_device *dev = usb_to_ohci(usb);
 	struct ohci_td *td;
@@ -2511,7 +2511,6 @@
 		writel(OHCI_USB_SUSPEND, &ohci->regs->control);
 		free_page((unsigned long) root_hub->hcca);
 		kfree(ohci->bus->root_hub);
-		root_hub->hcca = NULL;
 		ohci->bus->root_hub = NULL;
 	}
 
@@ -2601,7 +2600,6 @@
 			spin_unlock_irq(&current->sigmask_lock);
 
 			if(signr == SIGUSR1) {
-				/* TODO: have it do a full ed/td queue dump? */
 				printk(KERN_DEBUG "OHCI status dump:\n");
 				show_ohci_status(ohci);
 			} else if (signr == SIGUSR2) {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)