Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422899AbWJQLFX (ORCPT ); Tue, 17 Oct 2006 07:05:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1422697AbWJQLFX (ORCPT ); Tue, 17 Oct 2006 07:05:23 -0400 Received: from mtagate3.de.ibm.com ([195.212.29.152]:14327 "EHLO mtagate3.de.ibm.com") by vger.kernel.org with ESMTP id S1423041AbWJQLFT (ORCPT ); Tue, 17 Oct 2006 07:05:19 -0400 Date: Tue, 17 Oct 2006 13:05:54 +0200 From: Cornelia Huck To: Greg K-H Cc: Alan Stern , Duncan Sands , linux-kernel Subject: [Patch 1/4] Driver core: Don't stop probing on ->probe errors. Message-ID: <20061017130554.05b47075@gondolin.boeblingen.de.ibm.com> X-Mailer: Sylpheed-Claws 2.5.5 (GTK+ 2.8.20; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1427 Lines: 46 From: Cornelia Huck Don't stop on the first ->probe error that is not -ENODEV/-ENXIO. There might be a driver registered returning an unresonable return code, and this stops probing completely even though it may make sense to try the next possible driver. At worst, we may end up with an unbound device. Signed-off-by: Cornelia Huck --- drivers/base/dd.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) --- linux-2.6.orig/drivers/base/dd.c +++ linux-2.6/drivers/base/dd.c @@ -128,18 +128,17 @@ probe_failed: driver_sysfs_remove(dev); dev->driver = NULL; - if (ret == -ENODEV || ret == -ENXIO) { - /* Driver matched, but didn't support device - * or device not found. - * Not an error; keep going. - */ - ret = 0; - } else { + if (ret != -ENODEV && ret != -ENXIO) { /* driver matched but the probe failed */ printk(KERN_WARNING "%s: probe of %s failed with error %d\n", drv->name, dev->bus_id, ret); } + /* + * Ignore errors returned by ->probe so that the next driver can try + * its luck. + */ + ret = 0; done: kfree(data); atomic_dec(&probe_count); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/