d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"Completed" the previous fix. Return ENOMEM on memory allocation failure

Browse Source 
in sioattach(), not ENXIO.  Free resources before returning early in
sioprobe() and sioattach().
This commit is contained in:
Bruce Evans 2000-01-29 03:02:55 +00:00
parent e225ecbbd4
commit 689315d4f7
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/sio/sio.c
View File

@ -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);

9
sys/isa/sio.c
View File

@ -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);