From 67f0d41957392f0f9db82e773f5179f1068c2faa Mon Sep 17 00:00:00 2001 From: msmith Date: Thu, 30 Aug 2001 09:16:53 +0000 Subject: [PATCH] Correct usage of ISA_PNP_PROBE --- sys/dev/mse/mse.c | 4 ++-- sys/i386/isa/mse.c | 4 ++-- sys/i386/isa/pcaudio.c | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c index 7d5468265b40..81b9bb4de931 100644 --- a/sys/dev/mse/mse.c +++ b/sys/dev/mse/mse.c @@ -288,8 +288,8 @@ mse_probe(dev) /* check PnP IDs */ error = ISA_PNP_PROBE(device_get_parent(dev), dev, mse_ids); - if (error == ENXIO) - return ENXIO; + if (error != ENOENT) + return error; sc = device_get_softc(dev); rid = 0; diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c index 7d5468265b40..81b9bb4de931 100644 --- a/sys/i386/isa/mse.c +++ b/sys/i386/isa/mse.c @@ -288,8 +288,8 @@ mse_probe(dev) /* check PnP IDs */ error = ISA_PNP_PROBE(device_get_parent(dev), dev, mse_ids); - if (error == ENXIO) - return ENXIO; + if (error != ENOENT) + return error; sc = device_get_softc(dev); rid = 0; diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c index 1e4d4e9a2448..ebfce44e9a49 100644 --- a/sys/i386/isa/pcaudio.c +++ b/sys/i386/isa/pcaudio.c @@ -330,10 +330,7 @@ pcaprobe(device_t dev) int error; /* Check isapnp ids */ - error = ISA_PNP_PROBE(device_get_parent(dev), dev, pca_ids); - if (error == ENXIO) - return ENXIO; - return 0; + return(ISA_PNP_PROBE(device_get_parent(dev), dev, pca_ids)); }