diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-15 19:00:12 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-16 19:17:11 -0400 |
commit | 014c90dbb9b63bae067afc80a7931a76c5268ae3 (patch) | |
tree | 0cdea5ea29cc1cee3ec2f03baf7afc3d6a4d45be /drivers/base | |
parent | 4ccb457966391295bd9b3644f6bdc9ddd97b6051 (diff) |
driver core: prevent device_for_each_child from oopsing
David Vrabel noticed that the wireless usb stack likes to call
device_for_each_chile() with an empty bus. This used to work fine, but
now oopses. This patch fixes the oops and makes the code behave like it
used to.
Reported-by: David Vrabel <david.vrabel@csr.com>
Tested-by: David Vrabel <david.vrabel@csr.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index e73c92d13a23..d230ff4b3eec 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -1142,6 +1142,9 @@ int device_for_each_child(struct device *parent, void *data, | |||
1142 | struct device *child; | 1142 | struct device *child; |
1143 | int error = 0; | 1143 | int error = 0; |
1144 | 1144 | ||
1145 | if (!parent->p) | ||
1146 | return 0; | ||
1147 | |||
1145 | klist_iter_init(&parent->p->klist_children, &i); | 1148 | klist_iter_init(&parent->p->klist_children, &i); |
1146 | while ((child = next_device(&i)) && !error) | 1149 | while ((child = next_device(&i)) && !error) |
1147 | error = fn(child, data); | 1150 | error = fn(child, data); |