From 11b6d3ed9c1c04f04bfcca7ae9e29cc8d38704d3 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Fri, 14 Nov 2008 21:45:16 +0200 Subject: [PATCH] HSMMC: Fix boot crash on boards without gpio_cd set If .gpio_cd is -EINVAL, twl_mmc_late_init() is not called and hsmmc[x].mmc is not set, so don't use it in twl_mmc*_set_power(). Signed-off-by: Grazvydas Ignotas Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/mmc-twl4030.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index 0ea6ba6b867..626d6686717 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -239,6 +239,7 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, u32 reg; int ret = 0; struct twl_mmc_controller *c = &hsmmc[0]; + struct omap_mmc_platform_data *mmc = dev->platform_data; if (power_on) { if (cpu_is_omap2430()) { @@ -250,7 +251,7 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, omap_ctrl_writel(reg, OMAP243X_CONTROL_DEVCONF1); } - if (c->mmc->slots[0].internal_clock) { + if (mmc->slots[0].internal_clock) { reg = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); reg |= OMAP2_MMCSDIO1ADPCLKISEL; omap_ctrl_writel(reg, OMAP2_CONTROL_DEVCONF0); @@ -293,11 +294,11 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, static int twl_mmc2_set_power(struct device *dev, int slot, int power_on, int vdd) { int ret; - struct twl_mmc_controller *c = &hsmmc[1]; + struct omap_mmc_platform_data *mmc = dev->platform_data; if (power_on) { - if (c->mmc->slots[0].internal_clock) { + if (mmc->slots[0].internal_clock) { u32 reg; reg = omap_ctrl_readl(control_devconf1_offset); -- 2.41.1