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 ohci_reset_std_chain doesn't sleep so remov...



details:   https://anonhg.NetBSD.org/src/rev/9b263534c236
branches:  nick-nhusb
changeset: 334354:9b263534c236
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Dec 28 15:46:28 2015 +0000

description:
ohci_reset_std_chain doesn't sleep so remove the stray ASSERT_SLEEPABLE

diffstat:

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

diffs (26 lines):

diff -r ea352417578b -r 9b263534c236 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Mon Dec 28 10:15:09 2015 +0000
+++ b/sys/dev/usb/ohci.c        Mon Dec 28 15:46:28 2015 +0000
@@ -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 @@
            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);



Home | Main Index | Thread Index | Old Index