Synced with sys/isa/sio.c rev 1.287.

This commit is contained in:
KATO Takenori 2000-01-29 04:47:22 +00:00
parent c95e192ba7
commit 6dbccd6e00
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=56793
2 changed files with 16 additions and 2 deletions

View File

@ -1128,6 +1128,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);
}
@ -1739,7 +1740,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);

View File

@ -1128,6 +1128,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);
}
@ -1739,7 +1740,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);