From 4c824a9165d1134985945a4a2886b3b88453cd8c Mon Sep 17 00:00:00 2001 From: bde Date: Sat, 29 Jan 2000 03:02:55 +0000 Subject: "Completed" the previous fix. Return ENOMEM on memory allocation failure in sioattach(), not ENXIO. Free resources before returning early in sioprobe() and sioattach(). --- sys/dev/sio/sio.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'sys/dev/sio/sio.c') diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 4fcc02a..a409a55 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -677,6 +677,7 @@ sioprobe(dev) if (COM_LLCONSOLE(flags)) { printf("sio%d: reserved for low-level i/o\n", device_get_unit(dev)); + bus_release_resource(dev, SYS_RES_IOPORT, rid, port); return (ENXIO); } @@ -1048,7 +1049,13 @@ sioattach(dev) if (siosetwater(com, com->it_in.c_ispeed) != 0) { enable_intr(); free(com, M_DEVBUF); - return (ENXIO); + /* + * Leave i/o resources allocated if this is a `cn'-level + * console, so that other devices can't snarf them. + */ + if (iobase != siocniobase) + bus_release_resource(dev, SYS_RES_IOPORT, rid, port); + return (ENOMEM); } enable_intr(); termioschars(&com->it_in); -- cgit v1.1