summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-08-18 02:33:11 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-06 01:03:09 +0200
commitd65da6eae10cc77f93ead0188cde0b45f124d912 (patch)
tree2494fac5df0711f16cd4d49cc25133ea9d99b5e7 /drivers
parentMerge watchdog driver updates (diff)
downloadlinux-d65da6eae10cc77f93ead0188cde0b45f124d912.tar.xz
linux-d65da6eae10cc77f93ead0188cde0b45f124d912.zip
[PATCH] Fix manual binding infinite loop
Fix for manual binding of drivers to devices. Problem is if you pass in a valid device id, but the driver refuses to bind. Infinite loop as write() tries to resubmit the data it just sent. Thanks to Michal Ostrowski <mostrows@watson.ibm.com> for pointing the problem out. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/bus.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index ab53832d57e5..6966aff74efe 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -156,7 +156,9 @@ static ssize_t driver_unbind(struct device_driver *drv,
device_release_driver(dev);
err = count;
}
- return err;
+ if (err)
+ return err;
+ return count;
}
static DRIVER_ATTR(unbind, S_IWUSR, NULL, driver_unbind);