diff options
| -rw-r--r-- | drivers/base/bus.c | 8 | ||||
| -rw-r--r-- | drivers/base/dd.c | 2 | ||||
| -rw-r--r-- | include/linux/device.h | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index aa685a20b64..636af538a2b 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -392,6 +392,7 @@ out: * bus_attach_device - add device to bus * @dev: device tried to attach to a driver * + * - Add device to bus's list of devices. * - Try to attach to driver. */ int bus_attach_device(struct device * dev) @@ -400,11 +401,13 @@ int bus_attach_device(struct device * dev) int ret = 0; if (bus) { + dev->is_registered = 1; ret = device_attach(dev); if (ret >= 0) { klist_add_tail(&dev->knode_bus, &bus->klist_devices); ret = 0; - } + } else + dev->is_registered = 0; } return ret; } @@ -425,7 +428,8 @@ void bus_remove_device(struct device * dev) sysfs_remove_link(&dev->kobj, "bus"); sysfs_remove_link(&dev->bus->devices.kobj, dev->bus_id); device_remove_attrs(dev->bus, dev); - klist_remove(&dev->knode_bus); + dev->is_registered = 0; + klist_del(&dev->knode_bus); pr_debug("bus %s: remove device %s\n", dev->bus->name, dev->bus_id); device_release_driver(dev); put_bus(dev->bus); diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 319a73be418..b5f43c3e44f 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -162,6 +162,8 @@ int driver_probe_device(struct device_driver * drv, struct device * dev) struct task_struct *probe_task; int ret = 0; + if (!device_is_registered(dev)) + return -ENODEV; if (drv->bus->match && !drv->bus->match(dev, drv)) goto done; diff --git a/include/linux/device.h b/include/linux/device.h index 74246efba93..662e6a10144 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -329,6 +329,7 @@ struct device { struct kobject kobj; char bus_id[BUS_ID_SIZE]; /* position on parent bus */ + unsigned is_registered:1; struct device_attribute uevent_attr; struct device_attribute *devt_attr; @@ -381,7 +382,7 @@ dev_set_drvdata (struct device *dev, void *data) static inline int device_is_registered(struct device *dev) { - return klist_node_attached(&dev->knode_bus); + return dev->is_registered; } /* |