diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-03 09:36:50 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-03 09:37:08 +0700 |
| commit | cbd6c4f48adc67ecbfcb9aa4a721b24a9ea26932 (patch) | |
| tree | ef9c87ae4e9a14a19e2a0d95f1cb55c9e1e4edb5 /drivers/base | |
| parent | 6c5dadef809982e05b16ba7cf309e7c642a1b56a (diff) | |
| parent | 98bbf3565e3147a40c583ff97e2b5a98370c21a5 (diff) | |
| download | kernel_samsung_aries-cbd6c4f48adc67ecbfcb9aa4a721b24a9ea26932.zip kernel_samsung_aries-cbd6c4f48adc67ecbfcb9aa4a721b24a9ea26932.tar.gz kernel_samsung_aries-cbd6c4f48adc67ecbfcb9aa4a721b24a9ea26932.tar.bz2 | |
Merge 3.0.67
Change-Id: I269d39317336ca17a0d3a58932744e3d4a861c5d
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 000e7b2..8b8e8c0 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -289,7 +289,7 @@ int bus_for_each_dev(struct bus_type *bus, struct device *start, struct device *dev; int error = 0; - if (!bus) + if (!bus || !bus->p) return -EINVAL; klist_iter_init_node(&bus->p->klist_devices, &i, @@ -323,7 +323,7 @@ struct device *bus_find_device(struct bus_type *bus, struct klist_iter i; struct device *dev; - if (!bus) + if (!bus || !bus->p) return NULL; klist_iter_init_node(&bus->p->klist_devices, &i, |