Synced with sys/isa/sio.c rev 1.287.
This commit is contained in:
parent
c95e192ba7
commit
6dbccd6e00
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user