CVS commit: [netbsd-5] src/sys/dev/usb

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Fri Aug 12 20:52:25 UTC 2011

Modified Files:
        src/sys/dev/usb [netbsd-5]: ohci.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1655):
        sys/dev/usb/ohci.c: revision 1.218
PR# kern/30398: panic in ohci_softintr
If the host controller has a TD that the driver doesn't know about, ignore it
instead of calling panic. Patch from Karl Janmar.


To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.196.4.1 src/sys/dev/usb/ohci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.196 src/sys/dev/usb/ohci.c:1.196.4.1
--- src/sys/dev/usb/ohci.c:1.196	Wed Aug 13 09:43:56 2008
+++ src/sys/dev/usb/ohci.c	Fri Aug 12 20:52:25 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci.c,v 1.196 2008/08/13 09:43:56 drochner Exp $	*/
+/*	$NetBSD: ohci.c,v 1.196.4.1 2011/08/12 20:52:25 riz Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.196 2008/08/13 09:43:56 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.196.4.1 2011/08/12 20:52:25 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1330,7 +1330,9 @@
 			DPRINTFN(5,("add ITD %p\n", sitd));
 			continue;
 		}
-		panic("ohci_softintr: addr 0x%08lx not found", (u_long)done);
+		device_printf(sc->sc_dev, "WARNING: addr 0x%08lx not found\n",
+		    (u_long)done);
+		break;
 	}
 
 	DPRINTFN(10,("ohci_softintr: sdone=%p sidone=%p\n", sdone, sidone));