It doesn't make much sense to check whether child is NULL after already

having dereferenced it. We either should generally check the device_t's
supplied to bus functions before using them (which we seem to virtually
never do) or just assume that they are not NULL.
While at it make this code fit 78 columns.

Found with:	Coverity Prevent(tm)
CID:		4230
This commit is contained in:
Marius Strobl 2011-12-02 22:03:27 +00:00
parent f60d6c2bdf
commit 002214d6bb
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=228211

View File

@ -2018,10 +2018,11 @@ device_probe_child(device_t dev, device_t child)
else if (result != 0)
continue;
if (!hasclass) {
if (device_set_devclass(child, dl->driver->name)) {
printf("driver bug: Unable to set devclass (devname: %s)\n",
(child ? device_get_name(child) :
"no device"));
if (device_set_devclass(child,
dl->driver->name) != 0) {
printf("driver bug: Unable to set "
"devclass (devname: %s)\n",
device_get_name(child));
(void)device_set_driver(child, NULL);
continue;
}