[src/netbsd-7]: src/sys/dev/pci Pull up following revision(s) (requested by r...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aae6cfef3ff5
branches:  netbsd-7
changeset: 799774:aae6cfef3ff5
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jan 27 00:26:18 2016 +0000

description:
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

diffstat:

 sys/dev/pci/agp_i810.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 4a78cf6dcfe0 -r aae6cfef3ff5 sys/dev/pci/agp_i810.c
--- a/sys/dev/pci/agp_i810.c    Wed Jan 27 00:01:07 2016 +0000
+++ b/sys/dev/pci/agp_i810.c    Wed Jan 27 00:26:18 2016 +0000
@@ -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 @@
         */
        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;