Re: [PATCH] mmc: sdhi: initialise mmc_data->flags before use

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Thu, Aug 18 2011, Simon Horman wrote:
> This corrects a logic error that I introduced in
> "mmc: sdhi: Add write16_hook"
>
> Reported-by: Magnus Damm <magnus.damm@xxxxxxxxx>
> Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
> ---
>  drivers/mmc/host/sh_mobile_sdhi.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
> index 2fa7bbc..68702e4 100644
> --- a/drivers/mmc/host/sh_mobile_sdhi.c
> +++ b/drivers/mmc/host/sh_mobile_sdhi.c
> @@ -121,11 +121,11 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
>  	mmc_data->hclk = clk_get_rate(priv->clk);
>  	mmc_data->set_pwr = sh_mobile_sdhi_set_pwr;
>  	mmc_data->get_cd = sh_mobile_sdhi_get_cd;
> -	if (mmc_data->flags & TMIO_MMC_HAS_IDLE_WAIT)
> -		mmc_data->write16_hook = sh_mobile_sdhi_write16_hook;
>  	mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
>  	if (p) {
>  		mmc_data->flags = p->tmio_flags;
> +		if (mmc_data->flags & TMIO_MMC_HAS_IDLE_WAIT)
> +			mmc_data->write16_hook = sh_mobile_sdhi_write16_hook;
>  		mmc_data->ocr_mask = p->tmio_ocr_mask;
>  		mmc_data->capabilities |= p->tmio_caps;

Thanks, Simon, pushed to mmc-next for 3.1-rc.

- Chris.
-- 
Chris Ball   <cjb@xxxxxxxxxx>   <http://printf.net/>
One Laptop Per Child
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux USB Devel]     [Linux Media]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux