CVS commit: [netbsd-7] src/sys/dev/pci

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Wed Jan 27 00:26:18 UTC 2016

Modified Files:
        src/sys/dev/pci [netbsd-7]: agp_i810.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1078):
        sys/dev/pci/agp_i810.c: revision 1.120
        sys/dev/pci/agp_i810.c: revision 1.121
CID 1328433: Anding with 0 and comparing != 0 will not work very will.
Fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.112.2.4 -r1.112.2.5 src/sys/dev/pci/agp_i810.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/agp_i810.c
diff -u src/sys/dev/pci/agp_i810.c:1.112.2.4 src/sys/dev/pci/agp_i810.c:1.112.2.5
--- src/sys/dev/pci/agp_i810.c:1.112.2.4	Fri Nov  6 22:55:10 2015
+++ src/sys/dev/pci/agp_i810.c	Wed Jan 27 00:26:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp_i810.c,v 1.112.2.4 2015/11/06 22:55:10 riz Exp $	*/
+/*	$NetBSD: agp_i810.c,v 1.112.2.5 2016/01/27 00:26:18 snj Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.112.2.4 2015/11/06 22:55:10 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.112.2.5 2016/01/27 00:26:18 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -445,7 +445,7 @@ agp_i810_attach(device_t parent, device_
 	 */
 	mmadr_type = pci_mapreg_type(isc->vga_pa.pa_pc, isc->vga_pa.pa_tag,
 	    mmadr_bar);
-	if ((mmadr_type & PCI_MAPREG_TYPE_MEM) != PCI_MAPREG_TYPE_MEM) {
+	if (PCI_MAPREG_TYPE(mmadr_type) != PCI_MAPREG_TYPE_MEM) {
 		aprint_error_dev(self, "non-memory device MMIO registers\n");
 		error = ENXIO;
 		goto fail1;