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

Sergei Shtylyov sshtylyov at mvista.com
Wed Sep 22 14:05:47 EDT 2010


Hello.

kishore kadiyala wrote:

> From: Benoit Cousson <b-cousson at ti.com>

> Avoid possible crash if CONFIG_MMC_OMAP_HS is not set

> Signed-off-by: Benoit Cousson <b-cousson at ti.com>
> Signed-off-by: Kishore Kadiyala <kishore.kadiyala at ti.com>
> ---
>  arch/arm/mach-omap2/board-4430sdp.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
> index a49f285..ac8541c 100644
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@ -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



More information about the linux-arm-kernel mailing list