Correct logic error that would prevent cs pccards from working on

systems where the CardBus bridge was connected to a APIC.  The case
where the probe routine is told to not setup the IRQ was mishandled
but the error was masked in the case where the IRQ was a valid one
for the card.

MFC after:	1 week

1 files changed, 8 insertions, 8 deletions

diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 7c6ac93..4f17756 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -453,23 +453,23 @@ cs_cs89x0_probe(device_t dev)
 					irq = 2;
 					break;
 				default:
-					error=EINVAL;
+					error = EINVAL;
+					break;
 			}
 		} else {
-			if (irq > CS8920_NO_INTS) {
+			if (irq > CS8920_NO_INTS && !(sc->flags & CS_NO_IRQ))
 				error = EINVAL;
-			}
 		}
 	}
 
-	if (!error) {
-		if (!(sc->flags & CS_NO_IRQ))
-			cs_writereg(sc, pp_isaint, irq);
-	} else {
+	if (error) {
 	       	device_printf(dev, "Unknown or invalid irq\n");
-		return (ENXIO);
+		return (error);
 	}
 
+	if (!(sc->flags & CS_NO_IRQ))
+		cs_writereg(sc, pp_isaint, irq);
+
 	/*
 	 * Temporary disabled
 	 *