[PATCH] Small fixes to driver core
This patch (as603) makes a few small fixes to the driver core: Change spin_lock_irq for a klist lock to spin_lock; Fix reference count leaks; Minor spelling and formatting changes. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Acked-by Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
133747e8d1
commit
2b08c8d046
+9
-12
@@ -133,7 +133,7 @@ static struct kobj_type ktype_bus = {
|
||||
decl_subsys(bus, &ktype_bus, NULL);
|
||||
|
||||
|
||||
/* Manually detach a device from it's associated driver. */
|
||||
/* Manually detach a device from its associated driver. */
|
||||
static int driver_helper(struct device *dev, void *data)
|
||||
{
|
||||
const char *name = data;
|
||||
@@ -151,14 +151,13 @@ static ssize_t driver_unbind(struct device_driver *drv,
|
||||
int err = -ENODEV;
|
||||
|
||||
dev = bus_find_device(bus, NULL, (void *)buf, driver_helper);
|
||||
if ((dev) &&
|
||||
(dev->driver == drv)) {
|
||||
if (dev && dev->driver == drv) {
|
||||
device_release_driver(dev);
|
||||
err = count;
|
||||
}
|
||||
if (err)
|
||||
return err;
|
||||
return count;
|
||||
put_device(dev);
|
||||
put_bus(bus);
|
||||
return err;
|
||||
}
|
||||
static DRIVER_ATTR(unbind, S_IWUSR, NULL, driver_unbind);
|
||||
|
||||
@@ -175,16 +174,14 @@ static ssize_t driver_bind(struct device_driver *drv,
|
||||
int err = -ENODEV;
|
||||
|
||||
dev = bus_find_device(bus, NULL, (void *)buf, driver_helper);
|
||||
if ((dev) &&
|
||||
(dev->driver == NULL)) {
|
||||
if (dev && dev->driver == NULL) {
|
||||
down(&dev->sem);
|
||||
err = driver_probe_device(drv, dev);
|
||||
up(&dev->sem);
|
||||
put_device(dev);
|
||||
}
|
||||
if (err)
|
||||
return err;
|
||||
return count;
|
||||
put_device(dev);
|
||||
put_bus(bus);
|
||||
return err;
|
||||
}
|
||||
static DRIVER_ATTR(bind, S_IWUSR, NULL, driver_bind);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user