Commit b4e01e26 authored by Stas Sergeev's avatar Stas Sergeev Committed by Greg Kroah-Hartman

Driver core: fix driver_register() return value

commit 39acbc12 upstream.

In this patch:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=16dc42e018c2868211b4928f20a957c0c216126c
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: default avatarStas Sergeev <stsp@aknet.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6acffd27
...@@ -236,7 +236,7 @@ int driver_register(struct device_driver *drv) ...@@ -236,7 +236,7 @@ int driver_register(struct device_driver *drv)
put_driver(other); put_driver(other);
printk(KERN_ERR "Error: Driver '%s' is already registered, " printk(KERN_ERR "Error: Driver '%s' is already registered, "
"aborting...\n", drv->name); "aborting...\n", drv->name);
return -EEXIST; return -EBUSY;
} }
ret = bus_add_driver(drv); ret = bus_add_driver(drv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment