summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-07-14 18:41:03 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-07-14 18:41:03 +0000
commit8d749c48f10e597763969100bc994f7a091afdb1 (patch)
tree258be92c4461546d0179c286d917136ebe544cef /sys/dev
parent10d7f3b932f1eb4eeb23fea97eb91a793d0e7e2f (diff)
Silence ``invalid NVRAM header'' message if the NVRAM header is three zero
bytes (as encountered on sgi). ok krw@ deraadt@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/isp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c
index 2d0f10fdd18..5aec34177b1 100644
--- a/sys/dev/ic/isp.c
+++ b/sys/dev/ic/isp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp.c,v 1.46 2009/06/24 11:00:53 krw Exp $ */
+/* $OpenBSD: isp.c,v 1.47 2009/07/14 18:41:02 miod Exp $ */
/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.150 2008/12/15 21:42:38 marius Exp $*/
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
@@ -7396,7 +7396,10 @@ isp_read_nvram(struct ispsoftc *isp)
if (nvram_data[0] != 'I' || nvram_data[1] != 'S' ||
nvram_data[2] != 'P') {
if (isp->isp_bustype != ISP_BT_SBUS) {
- isp_prt(isp, ISP_LOGWARN, "invalid NVRAM header");
+ if (nvram_data[0] != 0 || nvram_data[1] != 0 ||
+ nvram_data[2] != 0)
+ isp_prt(isp, ISP_LOGWARN,
+ "invalid NVRAM header");
isp_prt(isp, ISP_LOGDEBUG0, "%x %x %x",
nvram_data[0], nvram_data[1], nvram_data[2]);
}