Source-Changes-HG archive

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

[src/nick-nhusb]: src/sys/dev/usb #ifdef DIAGNOSTIC ... panic... #endif -> KA...



details:   https://anonhg.NetBSD.org/src/rev/bb38457596ac
branches:  nick-nhusb
changeset: 804228:bb38457596ac
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Dec 22 08:23:35 2014 +0000

description:
#ifdef DIAGNOSTIC ... panic... #endif -> KASSERT

diffstat:

 sys/dev/usb/ehci.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r b9b7b1aa1943 -r bb38457596ac sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Fri Dec 19 09:52:35 2014 +0000
+++ b/sys/dev/usb/ehci.c        Mon Dec 22 08:23:35 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.234.2.16 2014/12/06 08:27:23 skrll Exp $ */
+/*     $NetBSD: ehci.c,v 1.234.2.17 2014/12/22 08:23:35 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.16 2014/12/06 08:27:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.17 2014/12/22 08:23:35 skrll Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -2793,10 +2793,7 @@
                        curlen -= curlen % mps;
                        USBHIST_LOG(ehcidebug, "multiple QTDs, "
                                    "curlen=%d", curlen, 0, 0, 0);
-#ifdef DIAGNOSTIC
-                       if (curlen == 0)
-                               panic("ehci_alloc_sqtd_chain: curlen == 0");
-#endif
+                       KASSERT(curlen != 0);
                }
                USBHIST_LOG(ehcidebug, "len=%d curlen=%d curoffs=%zu",
                        len, curlen, (size_t)curoffs, 0);



Home | Main Index | Thread Index | Old Index