diff options
| author |   Stas Sergeev <stsp@aknet.ru> | 2009-10-18 00:31:38 +0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-30 14:59:51 -0700 |
| commit | 39acbc12affcaa23ef1d887ba3d197baca8e6e47 (patch) | |
| tree | 51249000a01a41a4036c8be1313186b0c4116206 /drivers/base | |
| parent | Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen (diff) | |
| download | linux-dev-39acbc12affcaa23ef1d887ba3d197baca8e6e47.tar.xz linux-dev-39acbc12affcaa23ef1d887ba3d197baca8e6e47.zip | |
Driver core: fix driver_register() return value
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: Stas Sergeev <stsp@aknet.ru>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index ed2ebd3c287d..f367885a7646 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); |