Module Name: src
Committed By: skrll
Date: Mon Dec 28 15:46:28 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: ohci.c
Log Message:
ohci_reset_std_chain doesn't sleep so remove the stray ASSERT_SLEEPABLE
To generate a diff of this commit:
cvs rdiff -u -r1.254.2.37 -r1.254.2.38 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.254.2.37 src/sys/dev/usb/ohci.c:1.254.2.38
--- src/sys/dev/usb/ohci.c:1.254.2.37 Wed Dec 23 08:07:40 2015
+++ src/sys/dev/usb/ohci.c Mon Dec 28 15:46:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.254.2.37 2015/12/23 08:07:40 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.254.2.38 2015/12/28 15:46:28 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.37 2015/12/23 08:07:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.38 2015/12/28 15:46:28 skrll Exp $");
#include "opt_usb.h"
@@ -668,7 +668,6 @@ ohci_reset_std_chain(ohci_softc_t *sc, s
UE_GET_ADDR(xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress),
alen, xfer->ux_pipe->up_dev->ud_speed);
- ASSERT_SLEEPABLE();
KASSERT(sp);
int mps = UGETW(xfer->ux_pipe->up_endpoint->ue_edesc->wMaxPacketSize);
