Sat Mar 10 23:01:07 2012 UTC ()
remove checks against "!curproc".
(mrg)
diff -r1.75 -r1.76 src/sys/dev/usb/if_kue.c
diff -r1.221 -r1.222 src/sys/dev/usb/ohci.c
diff -r1.245 -r1.246 src/sys/dev/usb/uhci.c
--- src/sys/dev/usb/if_kue.c 2012/02/02 19:43:07 1.75
+++ src/sys/dev/usb/if_kue.c 2012/03/10 23:01:07 1.76
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.75 2012/02/02 19:43:07 tls Exp $ */
+/* $NetBSD: if_kue.c,v 1.76 2012/03/10 23:01:07 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.75 2012/02/02 19:43:07 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.76 2012/03/10 23:01:07 mrg Exp $");
#include "opt_inet.h"
@@ -985,13 +985,6 @@
if (sc->kue_dying)
return (EIO);
-
-#ifdef DIAGNOSTIC
- if (!curproc) {
- printf("%s: no proc!!\n", device_xname(sc->kue_dev));
- return EIO;
- }
-#endif
s = splnet();
--- src/sys/dev/usb/ohci.c 2012/03/06 03:35:29 1.221
+++ src/sys/dev/usb/ohci.c 2012/03/10 23:01:07 1.222
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.221 2012/03/06 03:35:29 mrg Exp $ */
+/* $NetBSD: ohci.c,v 1.222 2012/03/10 23:01:07 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.221 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.222 2012/03/10 23:01:07 mrg Exp $");
#include "opt_usb.h"
@@ -2240,7 +2240,7 @@
return;
}
- if (xfer->device->bus->intr_context || !curproc)
+ if (xfer->device->bus->intr_context)
panic("ohci_abort_xfer: not in process context");
/*
--- src/sys/dev/usb/uhci.c 2012/03/06 03:35:29 1.245
+++ src/sys/dev/usb/uhci.c 2012/03/10 23:01:07 1.246
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.245 2012/03/06 03:35:29 mrg Exp $ */
+/* $NetBSD: uhci.c,v 1.246 2012/03/10 23:01:07 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.245 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.246 2012/03/10 23:01:07 mrg Exp $");
#include "opt_usb.h"
@@ -2078,7 +2078,7 @@
return;
}
- if (xfer->device->bus->intr_context || !curproc)
+ if (xfer->device->bus->intr_context)
panic("uhci_abort_xfer: not in process context");
/*