The following commit has been merged in the linux branch: commit 39acbc12affcaa23ef1d887ba3d197baca8e6e47 Author: Stas Sergeev stsp@aknet.ru Date: Sun Oct 18 00:31:38 2009 +0400

Driver core: fix driver_register() return value

In this patch: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdif... the check was added for another driver to already claim the same device on the same bus. But the returned error code was wrong: to modprobe, the -EEXIST means that _this_ driver is already installed. It therefore doesn't produce the needed error message when _another_ driver is trying to register for the same device. Returning -EBUSY fixes the problem.

Signed-off-by: Stas Sergeev stsp@aknet.ru Cc: stable stable@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@suse.de

diff --git a/drivers/base/driver.c b/drivers/base/driver.c index ed2ebd3..f367885 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -236,7 +236,7 @@ int driver_register(struct device_driver *drv) put_driver(other); printk(KERN_ERR "Error: Driver '%s' is already registered, " "aborting...\n", drv->name); - return -EEXIST; + return -EBUSY; }

ret = bus_add_driver(drv);