From 35449eb7eed0f0ea88ccf53b87fd5487ff781cfd Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Tue, 29 Jan 2013 16:44:27 -0700 Subject: [PATCH] --- yaml --- r: 353721 b: refs/heads/master c: 4fa3e78be7e985ca814ce2aa0c09cbee404efcf7 h: refs/heads/master i: 353719: 26554fcb6b5b68f08c5d5539ca4308ac1d8caefc v: v3 --- [refs] | 2 +- trunk/drivers/base/bus.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 201df437f061..d48d20978f55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 422d26b6ecd77af8c77f2a40580679459825170f +refs/heads/master: 4fa3e78be7e985ca814ce2aa0c09cbee404efcf7 diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c index f9d31320bd37..519865b53f76 100644 --- a/trunk/drivers/base/bus.c +++ b/trunk/drivers/base/bus.c @@ -290,7 +290,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, @@ -324,7 +324,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,