---

yaml --- r: 282838 b: refs/heads/master c: 47882d7 h: refs/heads/master v: v3
git-mirror · Jan 9, 2012 · 12cb37c · 12cb37c
1 parent 24cf7f6
commit 12cb37c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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");