[34/99] Driver core: fix driver_register() return value

From: Greg KH
Date: Fri Nov 06 2009 - 17:38:55 EST

2.6.31-stable review patch. If anyone has any objections, please let us know.

From: Stas Sergeev <stsp@xxxxxxxx>

commit 39acbc12affcaa23ef1d887ba3d197baca8e6e47 upstream.

In this patch:
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@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

drivers/base/driver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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

ret = bus_add_driver(drv);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/