Module Name: src
Committed By: skrll
Date: Mon Dec 21 15:18:41 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: usbdi.c
Log Message:
usbd_close_pipe should never be called with NULL for pipe. Remove some
dead DIAGNOSTIC code when pipe == NULL
To generate a diff of this commit:
cvs rdiff -u -r1.162.2.36 -r1.162.2.37 src/sys/dev/usb/usbdi.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/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.162.2.36 src/sys/dev/usb/usbdi.c:1.162.2.37
--- src/sys/dev/usb/usbdi.c:1.162.2.36 Sat Dec 19 10:11:13 2015
+++ src/sys/dev/usb/usbdi.c Mon Dec 21 15:18:41 2015
@@ -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 @@ usbd_close_pipe(struct usbd_pipe *pipe)
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) {
