From patchwork Sat Apr 13 07:06:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [5/5] mtd: nand-gpio: Do not override GPIOs if driver uses platform_data but OF is enabled in kernel config From: Alexander Shiyan X-Patchwork-Id: 236301 Message-Id: <1365836798-29035-5-git-send-email-shc_work@mail.ru> To: linux-mtd@lists.infradead.org Cc: Artem Bityutskiy , Brian Norris , David Woodhouse , Alexander Shiyan Date: Sat, 13 Apr 2013 11:06:38 +0400 Signed-off-by: Alexander Shiyan --- drivers/mtd/nand/gpio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c index 16b8eeb..ea8adb5 100644 --- a/drivers/mtd/nand/gpio.c +++ b/drivers/mtd/nand/gpio.c @@ -105,6 +105,9 @@ static int gpio_nand_get_config_of(const struct device *dev, { u32 val; + if (!dev->of_node) + return -ENODEV; + if (!of_property_read_u32(dev->of_node, "bank-width", &val)) { if (val == 2) { plat->options |= NAND_BUSWIDTH_16;