Commit 37225401 authored Mar 22, 2006 by Ryan Wilson Committed by Greg Kroah-Hartman Apr 14, 2006

[PATCH] driver core: driver_bind attribute returns incorrect value

The manual driver <-> device binding attribute in sysfs doesn't return
the correct value on failure or success of driver_probe_device.
driver_probe_device returns 1 on success (the driver accepted the
device) or 0 on probe failure (when the driver didn't accept the
device but no real error occured). However, the attribute can't just
return 0 or 1, it must return the number of bytes consumed from buf
or an error value. Returning 0 indicates to userspace that nothing
was written (even though the kernel has tried to do the bind/probe and
failed). Returning 1 indicates that only one character was accepted in
which case userspace will re-try the write with a partial string.

A more correct version of driver_bind would return count (to indicate
the entire string was consumed) when driver_probe_device returns 1
and -ENODEV when driver_probe_device returns 0. This patch makes that
change.

Signed-off-by: Ryan Wilson <hap9@epoch.ncsc.mil>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent a1438890

drivers/base/bus.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -188,6 +188,11 @@ static ssize_t driver_bind(struct device_driver *drv,
	up(&dev->sem);		up(&dev->sem);
	if (dev->parent)		if (dev->parent)
	up(&dev->parent->sem);		up(&dev->parent->sem);

			if (err > 0) /* success */
			err = count;
			else if (err == 0) /* driver didn't accept device */
			err = -ENODEV;
	}		}
	put_device(dev);		put_device(dev);
	put_bus(bus);		put_bus(bus);