From 75755ce3da94ff23d1dc718e524aca6c087003c8 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Sun, 22 Jul 2012 08:59:57 +0200
Subject: [PATCH] --- yaml --- r: 332710 b: refs/heads/master c:
 da3888cb84065a03d30b5f729b405e573bd0d66e h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mtd/nand/plat_nand.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c4eccc603727..32113efeb9c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8c4bf26109878d39b5e6d1425b8c9cd562ef525
+refs/heads/master: da3888cb84065a03d30b5f729b405e573bd0d66e
diff --git a/trunk/drivers/mtd/nand/plat_nand.c b/trunk/drivers/mtd/nand/plat_nand.c
index 1bcb52040422..a47ee68a0cfa 100644
--- a/trunk/drivers/mtd/nand/plat_nand.c
+++ b/trunk/drivers/mtd/nand/plat_nand.c
@@ -37,6 +37,11 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)
 	const char **part_types;
 	int err = 0;
 
+	if (!pdata) {
+		dev_err(&pdev->dev, "platform_nand_data is missing\n");
+		return -EINVAL;
+	}
+
 	if (pdata->chip.nr_chips < 1) {
 		dev_err(&pdev->dev, "invalid number of chips specified\n");
 		return -EINVAL;