[src/trunk]: src/sys/dev/pci PR/50820: David Binderman: Fail when !(edge|puls...

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

details:   https://anonhg.NetBSD.org/src/rev/ad0924e1cb88
branches:  trunk
changeset: 813775:ad0924e1cb88
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Feb 17 20:00:15 2016 +0000

description:
PR/50820: David Binderman: Fail when !(edge|pulse) instead of !edge && edge

diffstat:

 sys/dev/pci/pccbb.c |  15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diffs (40 lines):

diff -r e002b316e3ce -r ad0924e1cb88 sys/dev/pci/pccbb.c
--- a/sys/dev/pci/pccbb.c       Wed Feb 17 19:57:01 2016 +0000
+++ b/sys/dev/pci/pccbb.c       Wed Feb 17 20:00:15 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pccbb.c,v 1.208 2015/03/26 20:13:28 nakayama Exp $     */
+/*     $NetBSD: pccbb.c,v 1.209 2016/02/17 20:00:15 christos Exp $     */
 
 /*
  * Copyright (c) 1998, 1999 and 2000
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.208 2015/03/26 20:13:28 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.209 2016/02/17 20:00:15 christos Exp $");
 
 /*
 #define CBB_DEBUG
@@ -2766,17 +2766,14 @@
 {
        struct pccbb_softc *sc = (struct pccbb_softc *)pch;
 
-       if (!(pf->cfe->flags & PCMCIA_CFE_IRQLEVEL)) {
-               /* what should I do? */
-               if ((pf->cfe->flags & PCMCIA_CFE_IRQLEVEL)) {
-                       DPRINTF(("%s does not provide edge nor pulse "
-                           "interrupt\n", device_xname(sc->sc_dev)));
-                       return NULL;
-               }
+       if (!(pf->cfe->flags & (PCMCIA_CFE_IRQLEVEL|PCMCIA_CFE_IRQPULSE))) {
                /*
                 * XXX Noooooo!  The interrupt flag must set properly!!
                 * dumb pcmcia driver!!
                 */
+               DPRINTF(("%s does not provide edge nor pulse interrupt\n",
+                   device_xname(sc->sc_dev)));
+               return NULL;
        }
 
        return pccbb_intr_establish(sc, ipl, func, arg);