From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759828Ab0D3WYm (ORCPT ); Fri, 30 Apr 2010 18:24:42 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:56824 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756072Ab0D3WYk (ORCPT ); Fri, 30 Apr 2010 18:24:40 -0400 From: Marc Kleine-Budde To: linux-mtd@lists.infradead.org Cc: Marc Kleine-Budde , Artem Bityutskiy , David Woodhouse , Kevin Cernekee , Adrian Hunter , Dmitry Pervushin , Roel Kluin , linux-kernel@vger.kernel.org Date: Thu, 29 Apr 2010 12:41:04 +0200 Message-Id: <1272537664-21603-1-git-send-email-mkl@pengutronix.de> X-Mailer: git-send-email 1.7.1 X-SA-Exim-Connect-IP: 92.198.50.58 X-SA-Exim-Mail-From: mkl@pengutronix.de Subject: [PATCH] ubi: init even if mtd device cannot be attached, if built into kernel X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ubi can be built into the kernel or be compiled as a kernel module. Further on the command line one can specify mtd devices to be attach to ubi while loading. In the current implementation the ubi driver refuses to load if one of the mtd devices cannot be attached. Consider: 1) ubi compiled into the kernel and 2) a mtd device specified on the command line and 3) this mtd device contains bogus data (for whatever reason). During init ubi tries to attach the mtd device is this fails the whole ubi subsystem isn't initialized. Later the userspace cannot attach any mtd to ubi because ubi isn't loaded. This patch keeps the current behaviour: if ubi is compiled as a module and a mtd device cannot be attached the ubi module cannot be loaded, but changes it for the ubi-is-built-into-the-kernel usecase. If ubi is builtin, a not attachable mtd device doen't stop ubi from initializing. This slightly modifies the behaviour if multiple mtd devices are specified on the command line. Now every mtd device is probed and, if possible, attached, i.e. a faulty mtd device doesn't stop the others from being attached. Signed-off-by: Marc Kleine-Budde --- drivers/mtd/ubi/build.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 14cec04..2f6f09f 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -123,6 +123,12 @@ static struct device_attribute dev_bgt_enabled = static struct device_attribute dev_mtd_num = __ATTR(mtd_num, S_IRUGO, dev_attribute_show, NULL); +#ifdef CONFIG_MTD_UBI_MODULE +static inline int ubi_is_module(void) { return 1; } +#else +static inline int ubi_is_module(void) { return 0; } +#endif + /** * ubi_volume_notify - send a volume change notification. * @ubi: UBI device description object @@ -1200,9 +1206,11 @@ static int __init ubi_init(void) p->vid_hdr_offs); mutex_unlock(&ubi_devices_mutex); if (err < 0) { - put_mtd_device(mtd); ubi_err("cannot attach mtd%d", mtd->index); - goto out_detach; + if (ubi_is_module()) { + put_mtd_device(mtd); + goto out_detach; + } } } -- 1.7.1