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

Change some KASSERT to device_printf + return EINVAL. There's no need to

Browse Source 
bring the whole kernel down due to a configuration error detected when a
module is loaded, it suffices to just not attach the device.
This commit is contained in:
Ian Lepore 2020-01-08 22:48:14 +00:00
parent b29fdcf8b3
commit a5910414d4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=356522
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/dev/iicbus/mux/iicmux.c
View File

@ -222,10 +222,16 @@ iicmux_add_child(device_t dev, device_t child, int busidx)
{
struct iicmux_softc *sc = device_get_softc(dev);
KASSERT(busidx < sc->numbuses,
("iicmux_add_child: bus idx %d too big", busidx));
KASSERT(sc->childdevs[busidx] == NULL,
("iicmux_add_child: bus idx %d already added", busidx));
if (busidx >= sc->numbuses) {
device_printf(dev,
"iicmux_add_child: bus idx %d too big", busidx);
return (EINVAL);
}
if (sc->childdevs[busidx] != NULL) {
device_printf(dev, "iicmux_add_child: bus idx %d already added",
busidx);
return (EINVAL);
}
sc->childdevs[busidx] = child;
if (sc->maxbus < busidx)
@ -240,12 +246,11 @@ iicmux_attach(device_t dev, device_t busdev, int numbuses)
struct iicmux_softc *sc = device_get_softc(dev);
int i, numadded;
/*
* Init the softc...
*/
KASSERT(numbuses <= IICMUX_MAX_BUSES,
("iicmux_attach: numbuses %d exceeds max %d\n",
numbuses, IICMUX_MAX_BUSES));
if (numbuses >= IICMUX_MAX_BUSES) {
device_printf(dev, "iicmux_attach: numbuses %d > max %d\n",
numbuses, IICMUX_MAX_BUSES);
return (EINVAL);
}
sc->dev = dev;
sc->busdev = busdev;