Skip to contentSkip to conversation

omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set

PATCH Superseded kishore kadiyala 3 participants 3 messages Sep 22, 2010 – Sep 24, 2010

Subsystems (4)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 2/4 omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set

From: Benoit Cousson <[email protected]>

Avoid possible crash if CONFIG_MMC_OMAP_HS is not set

---
 arch/arm/mach-omap2/board-4430sdp.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/board-4430sdp.c +7 -1
index a49f285..ac8541c 100644
@@ -240,8 +240,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 omap4_twl6030_hsmmc_set_late_init\n");
+		return;
+	}
+	pdata = dev->platform_data;
 	pdata->init =	omap4_twl6030_hsmmc_late_init;
 }
 
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH v3 2/4 omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set

Hello.

Quoted 15 lines · kishore kadiyala

From: Benoit Cousson <[email protected]>

Avoid possible crash if CONFIG_MMC_OMAP_HS is not set

---
 arch/arm/mach-omap2/board-4430sdp.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/board-4430sdp.c +0 -0
index a49f285..ac8541c 100644

arch/arm/mach-omap2/board-4430sdp.c static int omap4_twl6030_hsmmc_late_init(struct device *dev) · line 247

Quoted 9 lines
arch/arm/mach-omap2/board-4430sdp.c +4 -1
@@ -240,8 +240,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 omap4_twl6030_hsmmc_set_late_init\n");
    pr_err("Failed %s\n", __func__);

WBR, Sergei

#2 lore raw

PATCH v3 2/4 omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set

Quoted 27 lines · Sergei Shtylyov

Hello.

Quoted 23 lines · kishore kadiyala

From: Benoit Cousson <[email protected]>

Avoid possible crash if CONFIG_MMC_OMAP_HS is not set

---
?arch/arm/mach-omap2/board-4430sdp.c | ? ?8 +++++++- ?1 files changed, 7 insertions(+), 1 deletions(-)

arch/arm/mach-omap2/board-4430sdp.c +1 -1
index a49f285..ac8541c 100644
@@ -240,8 +240,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;
 
Quoted 5 lines

arch/arm/mach-omap2/board-4430sdp.c static int omap4_twl6030_hsmmc_late_init(struct · line 248

Quoted 3 lines
arch/arm/mach-omap2/board-4430sdp.c +3 -0
+ ? ? ? /* dev can be null if CONFIG_MMC_OMAP_HS is not set */
+ ? ? ? if (!dev) {
+ ? ? ? ? ? ? ? pr_err("Failed omap4_twl6030_hsmmc_set_late_init\n");

? pr_err("Failed %s\n", __func__);

OK , will have as mentioned

Quoted 2 lines

WBR, Sergei

Regards,
Kishore