Module Name: src
Committed By: cliff
Date: Sat Feb 5 06:13:17 UTC 2011
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_usbi.c
Log Message:
- if obio_intr is OBIOCF_INTR_DEFAULT, don't establish an interrupt
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/rmi/rmixl_usbi.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/arch/mips/rmi/rmixl_usbi.c
diff -u src/sys/arch/mips/rmi/rmixl_usbi.c:1.1.2.5 src/sys/arch/mips/rmi/rmixl_usbi.c:1.1.2.6
--- src/sys/arch/mips/rmi/rmixl_usbi.c:1.1.2.5 Mon Apr 12 22:42:07 2010
+++ src/sys/arch/mips/rmi/rmixl_usbi.c Sat Feb 5 06:13:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_usbi.c,v 1.1.2.5 2010/04/12 22:42:07 cliff Exp $ */
+/* $NetBSD: rmixl_usbi.c,v 1.1.2.6 2011/02/05 06:13:16 cliff Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_usbi.c,v 1.1.2.5 2010/04/12 22:42:07 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_usbi.c,v 1.1.2.6 2011/02/05 06:13:16 cliff Exp $");
#include "locators.h"
@@ -173,11 +173,14 @@
RMIXL_USBI_GEN_WRITE(RMIXL_USB_INTERRUPT_ENABLE, 0);
/* establish interrupt */
- ih = rmixl_intr_establish(obio->obio_intr, obio->obio_tmsk,
- IPL_USB, RMIXL_TRIG_LEVEL, RMIXL_POLR_HIGH,
- rmixl_usbi_intr, sc, false);
- if (ih == NULL)
- panic("%s: couldn't establish interrupt", device_xname(self));
+ if (obio->obio_intr != OBIOCF_INTR_DEFAULT) {
+ ih = rmixl_intr_establish(obio->obio_intr, obio->obio_tmsk,
+ IPL_USB, RMIXL_TRIG_LEVEL, RMIXL_POLR_HIGH,
+ rmixl_usbi_intr, sc, false);
+ if (ih == NULL)
+ panic("%s: couldn't establish interrupt",
+ device_xname(self));
+ }
aprint_normal("\n");
