summaryrefslogtreecommitdiffstats
path: root/sys/dev/sio
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2006-06-30 06:27:24 +0000
committerimp <imp@FreeBSD.org>2006-06-30 06:27:24 +0000
commit0268c7d9292afdd2da8404919dd9ae460f15b442 (patch)
tree2871d279c9eab699f24702aa3e539940190b7749 /sys/dev/sio
parent6d4f7a588c0904195e2770ce370af0d53f1ad7e2 (diff)
downloadFreeBSD-src-0268c7d9292afdd2da8404919dd9ae460f15b442.zip
FreeBSD-src-0268c7d9292afdd2da8404919dd9ae460f15b442.tar.gz
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
Diffstat (limited to 'sys/dev/sio')
-rw-r--r--sys/dev/sio/sio.c4
1 files changed, 2 insertions, 2 deletions
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
OpenPOWER on IntegriCloud