Module Name:    src
Committed By:   msaitoh
Date:           Tue May  5 18:08:29 UTC 2009

Modified Files:
        src/sys/dev/pci: if_bge.c

Log Message:
Doesn't print error message only when the register is BGE_SRS_MODE.
It occurs on some environment (and once after boot?). Other *BSDs and
Linux don't print the error message for all registers.


To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/dev/pci/if_bge.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/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.164 src/sys/dev/pci/if_bge.c:1.165
--- src/sys/dev/pci/if_bge.c:1.164	Thu Apr 23 10:47:44 2009
+++ src/sys/dev/pci/if_bge.c	Tue May  5 18:08:28 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bge.c,v 1.164 2009/04/23 10:47:44 msaitoh Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.165 2009/05/05 18:08:28 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.164 2009/04/23 10:47:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.165 2009/05/05 18:08:28 msaitoh Exp $");
 
 #include "bpfilter.h"
 #include "vlan.h"
@@ -4192,8 +4192,14 @@
 		  DELAY(1000);
 	}
 
-	aprint_error_dev(sc->bge_dev,
-	    "block failed to stop: reg 0x%lx, bit 0x%08x\n", (u_long)reg, bit);
+	/*
+	 * Doesn't print only when the register is BGE_SRS_MODE. It occurs
+	 * on some environment (and once after boot?)
+	 */
+	if (reg != BGE_SRS_MODE)
+		aprint_error_dev(sc->bge_dev,
+		    "block failed to stop: reg 0x%lx, bit 0x%08x\n",
+		    (u_long)reg, bit);
 }
 
 /*

Reply via email to