Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/usb PR# kern/30398: panic in ohci_softintr



details:   https://anonhg.NetBSD.org/src/rev/4acf8fce7c62
branches:  trunk
changeset: 768064:4acf8fce7c62
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Aug 07 13:45:46 2011 +0000

description:
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.

diffstat:

 sys/dev/usb/ohci.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r f943cbe1c336 -r 4acf8fce7c62 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Sun Aug 07 13:39:23 2011 +0000
+++ b/sys/dev/usb/ohci.c        Sun Aug 07 13:45:46 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.217 2011/07/30 20:05:36 jmcneill Exp $      */
+/*     $NetBSD: ohci.c,v 1.218 2011/08/07 13:45:46 jmcneill 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.217 2011/07/30 20:05:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218 2011/08/07 13:45:46 jmcneill Exp $");
 
 #include "opt_usb.h"
 
@@ -1293,7 +1293,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));



Home | Main Index | Thread Index | Old Index