From 0268c7d9292afdd2da8404919dd9ae460f15b442 Mon Sep 17 00:00:00 2001 From: imp Date: Fri, 30 Jun 2006 06:27:24 +0000 Subject: Have sio return BIS_PROBE_DEFAULT like all the other drivers in the tree... John Baldwin noted that sio might pass values between probe and attach via softc. It appears that sio does leave the hardware in a known state after probing, so other drivers that try to probe might leave it in a worse state. It doesn't seem to pass any data in softc, however, that I could find... I think we should not be probing for anything but nonPnP isa, but that's a change for another day. Submitted by: Frank Behrens PR: 87845 --- sys/dev/sio/sio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/dev/sio/sio.c') diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index d815dc6..a2057e0 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -700,7 +700,7 @@ sioprobe(dev, xrid, rclk, noprobe) device_set_softc(dev, NULL); free(com, M_DEVBUF); } - return (result); + return (result == 0 ? BUS_PROBE_DEFAULT : result); } /* @@ -777,7 +777,7 @@ sioprobe(dev, xrid, rclk, noprobe) device_set_softc(dev, NULL); free(com, M_DEVBUF); } - return (result); + return (result == 0 ? BUS_PROBE_DEFAULT : result); } #ifdef COM_ESP -- cgit v1.1