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 usbd_close_pipe should never be called with...



details:   https://anonhg.NetBSD.org/src/rev/bbad1669c77c
branches:  nick-nhusb
changeset: 334342:bbad1669c77c
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Dec 21 15:18:41 2015 +0000

description:
usbd_close_pipe should never be called with NULL for pipe.  Remove some
dead DIAGNOSTIC code when pipe == NULL

diffstat:

 sys/dev/usb/usbdi.c |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (31 lines):

diff -r 7ba109f568c1 -r bbad1669c77c sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Mon Dec 21 12:26:38 2015 +0000
+++ b/sys/dev/usb/usbdi.c       Mon Dec 21 15:18:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.c,v 1.162.2.36 2015/12/19 10:11:13 skrll Exp $   */
+/*     $NetBSD: usbdi.c,v 1.162.2.37 2015/12/21 15:18:41 skrll Exp $   */
 
 /*
  * Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.36 2015/12/19 10:11:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.37 2015/12/21 15:18:41 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -240,12 +240,6 @@
        USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 
        KASSERT(pipe != NULL);
-#ifdef DIAGNOSTIC
-       if (pipe == NULL) {
-               USBHIST_LOG(usbdebug, "pipe == NULL", 0, 0, 0, 0);
-               return USBD_NORMAL_COMPLETION;
-       }
-#endif
 
        usbd_lock_pipe(pipe);
        if (--pipe->up_refcnt != 0) {



Home | Main Index | Thread Index | Old Index