summaryrefslogtreecommitdiff
path: root/drivers/base/driver.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-19 19:17:30 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-19 19:17:30 -0700
commit7cd9c9bb57476167e83b7780dbc06d1dd601789d (patch)
treeafcf43a6d5e4661306676ebcd08224906170b578 /drivers/base/driver.c
parent591bfc6bf9e5e25e464fd4c87d64afd5135667c4 (diff)
Revert "driver core: check start node in klist_iter_init_node"
This reverts commit a15d49fd3094cff90e5410ca454a870e0a722fe1 as that patch broke the build. Cc: Hannes Reinecke <hare@suse.de> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/driver.c')
-rw-r--r--drivers/base/driver.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 16f6dd2c4403..3ec3896c83a6 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -49,13 +49,11 @@ int driver_for_each_device(struct device_driver *drv, struct device *start,
if (!drv)
return -EINVAL;
- error = klist_iter_init_node(&drv->p->klist_devices, &i,
- start ? &start->p->knode_driver : NULL);
- if (!error) {
- while ((dev = next_device(&i)) && !error)
- error = fn(dev, data);
- klist_iter_exit(&i);
- }
+ klist_iter_init_node(&drv->p->klist_devices, &i,
+ start ? &start->p->knode_driver : NULL);
+ while ((dev = next_device(&i)) && !error)
+ error = fn(dev, data);
+ klist_iter_exit(&i);
return error;
}
EXPORT_SYMBOL_GPL(driver_for_each_device);
@@ -85,10 +83,8 @@ struct device *driver_find_device(struct device_driver *drv,
if (!drv)
return NULL;
- if (klist_iter_init_node(&drv->p->klist_devices, &i,
- (start ? &start->p->knode_driver : NULL)) < 0)
- return NULL;
-
+ klist_iter_init_node(&drv->p->klist_devices, &i,
+ (start ? &start->p->knode_driver : NULL));
while ((dev = next_device(&i)))
if (match(dev, data) && get_device(dev))
break;