diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2015-11-20 20:36:02 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-11-23 08:00:09 +0100 |
| commit | 81a0cfce8d2ccf85bfaaef4c0f2b450f0329d9bb (patch) | |
| tree | 75f9f48a3bae6f461414c0941b9a77f858649abb | |
| parent | 144adf217030cbb5f7d9fd2acde6e257f5ba12d2 (diff) | |
| download | barebox-81a0cfce8d2ccf85bfaaef4c0f2b450f0329d9bb.tar.gz barebox-81a0cfce8d2ccf85bfaaef4c0f2b450f0329d9bb.tar.xz | |
mtd: nand_mrvl_nfc: Protect mrvl_nand_probe_dt
Parsing DT nodes if CONFIG_OFTREE isn't enabled is pointless, also
we should prefer potential platform_data passed earlier.
Protect mrvl_nand_probe_dt by bailing out early if either
CONFIG_OFTREE is not enabled or dev's platform_data is non-NULL.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/mtd/nand/nand_mrvl_nfc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nand_mrvl_nfc.c b/drivers/mtd/nand/nand_mrvl_nfc.c index ac530fc624..95abd4ddf2 100644 --- a/drivers/mtd/nand/nand_mrvl_nfc.c +++ b/drivers/mtd/nand/nand_mrvl_nfc.c @@ -983,6 +983,9 @@ static int mrvl_nand_probe_dt(struct mrvl_nand_host *host) { struct device_node *np = host->dev->device_node; + if (!IS_ENABLED(CONFIG_OFTREE) || host->dev->platform_data) + return 0; + if (of_get_property(np, "marvell,nand-keep-config", NULL)) host->keep_config = 1; of_property_read_u32(np, "num-cs", &host->cs); |