Module Name: src
Committed By: skrll
Date: Wed Feb 10 20:33:27 UTC 2010
Modified Files:
src/sys/arch/hp700/dev: wax.c
Log Message:
Don't panic if bus_space_map fails. Just report the error and return.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp700/dev/wax.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/hp700/dev/wax.c
diff -u src/sys/arch/hp700/dev/wax.c:1.14 src/sys/arch/hp700/dev/wax.c:1.15
--- src/sys/arch/hp700/dev/wax.c:1.14 Tue Nov 3 05:07:25 2009
+++ src/sys/arch/hp700/dev/wax.c Wed Feb 10 20:33:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wax.c,v 1.14 2009/11/03 05:07:25 snj Exp $ */
+/* $NetBSD: wax.c,v 1.15 2010/02/10 20:33:27 skrll Exp $ */
/* $OpenBSD: wax.c,v 1.1 1998/11/23 03:04:10 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.14 2009/11/03 05:07:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.15 2010/02/10 20:33:27 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -132,8 +132,10 @@
* Map the WAX interrupt registers.
*/
if (bus_space_map(ca->ca_iot, ca->ca_hpa, sizeof(struct wax_regs),
- 0, &ioh))
- panic("waxattach: can't map interrupt registers");
+ 0, &ioh)) {
+ aprint_error(": can't map interrupt registers\n");
+ return;
+ }
sc->sc_regs = (struct wax_regs *)ca->ca_hpa;
/* interrupts guts */
