From 12cb37ca3cbbeb89f5a824a4d04a3c8f1d123ace Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Sun, 4 Dec 2011 10:37:36 +0100 Subject: [PATCH] --- yaml --- r: 282838 b: refs/heads/master c: 47882d78250a8b92a9837d14bab32915622a9f12 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/davinci_nand.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 449a7d4ce205..dc8d55c72e2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e32de766c2eb65f775438dd6d8ec5007619d2fe5 +refs/heads/master: 47882d78250a8b92a9837d14bab32915622a9f12 diff --git a/trunk/drivers/mtd/nand/davinci_nand.c b/trunk/drivers/mtd/nand/davinci_nand.c index c153e1f77f90..6e566156956f 100644 --- a/trunk/drivers/mtd/nand/davinci_nand.c +++ b/trunk/drivers/mtd/nand/davinci_nand.c @@ -675,7 +675,9 @@ static int __init nand_davinci_probe(struct platform_device *pdev) davinci_nand_writel(info, A1CR_OFFSET + info->core_chipsel * 4, val); - ret = davinci_aemif_setup_timing(info->timing, info->base, + ret = 0; + if (info->timing) + ret = davinci_aemif_setup_timing(info->timing, info->base, info->core_chipsel); if (ret < 0) { dev_dbg(&pdev->dev, "NAND timing values setup fail\n");