From e5bc88613710428372903ba84c0b86af691c13c6 Mon Sep 17 00:00:00 2001
From: Benoit Cousson <b-cousson@ti.com>
Date: Fri, 1 Oct 2010 16:35:26 -0700
Subject: [PATCH] --- yaml --- r: 216959 b: refs/heads/master c:
 531c21ba1a298422ace28efbcdf94d5579a1b702 h: refs/heads/master i:   216957:
 dd98450c3609b06e0580ef73bea6989e3301f20b   216955:
 24353ff2c22c7a000e90ee88c5bee10715916597   216951:
 f5f410fd55829cd19529a48e645c39e4597d3949   216943:
 654f2729e5e4844e5e457c517255153f3d72454b   216927:
 9d0f2c3dfaa580ee8f13d7ea327216a8eb62b03b   216895:
 49c998f924002007209d8c8c1d73b52980de8989   216831:
 751691344ce8d89d930910a5720d09df3f3fa67b v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/mach-omap2/board-4430sdp.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c4e77444d575..29bbaaf9d36c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07ad64b60c4d1f2bdbefa5db29ccb235596bc670
+refs/heads/master: 531c21ba1a298422ace28efbcdf94d5579a1b702
diff --git a/trunk/arch/arm/mach-omap2/board-4430sdp.c b/trunk/arch/arm/mach-omap2/board-4430sdp.c
index 1bed1e666a60..cdb93734dd72 100644
--- a/trunk/arch/arm/mach-omap2/board-4430sdp.c
+++ b/trunk/arch/arm/mach-omap2/board-4430sdp.c
@@ -275,8 +275,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev)
 
 static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)
 {
-	struct omap_mmc_platform_data *pdata = dev->platform_data;
+	struct omap_mmc_platform_data *pdata;
 
+	/* dev can be null if CONFIG_MMC_OMAP_HS is not set */
+	if (!dev) {
+		pr_err("Failed %s\n", __func__);
+		return;
+	}
+	pdata = dev->platform_data;
 	pdata->init =	omap4_twl6030_hsmmc_late_init;
 }