From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932991AbZKFWio (ORCPT ); Fri, 6 Nov 2009 17:38:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932971AbZKFWim (ORCPT ); Fri, 6 Nov 2009 17:38:42 -0500 Received: from kroah.org ([198.145.64.141]:56808 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932382AbZKFWWs (ORCPT ); Fri, 6 Nov 2009 17:22:48 -0500 X-Mailbox-Line: From gregkh@mini.kroah.org Fri Nov 6 14:15:43 2009 Message-Id: <20091106221543.125163308@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Fri, 06 Nov 2009 14:14:32 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Stas Sergeev Subject: [34/99] Driver core: fix driver_register() return value References: <20091106221358.309857998@mini.kroah.org> Content-Disposition: inline; filename=driver-core-fix-driver_register-return-value.patch In-Reply-To: <20091106221850.GA15408@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.31-stable review patch. If anyone has any objections, please let us know. ------------------ From: Stas Sergeev commit 39acbc12affcaa23ef1d887ba3d197baca8e6e47 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: Stas Sergeev Signed-off-by: Greg Kroah-Hartman --- 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 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);