]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
mtd: nand-gpio: Do not override GPIOs if driver uses platform_data but OF is enabled...
authorAlexander Shiyan <shc_work@mail.ru>
Mon, 6 May 2013 13:53:50 +0000 (17:53 +0400)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 5 Aug 2013 19:45:16 +0000 (20:45 +0100)
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/nand/gpio.c

index 8f102d162126ca4b5b01f2c5b581455683aacb77..0d26f8b7d9d0af4f02342ed74ac77c247482b1a3 100644 (file)
@@ -151,6 +151,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;