From 7a2218af4edf1c9e1fb3d0c24ff025c91099ca75 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Fri, 19 Aug 2011 10:07:07 +0900 Subject: [PATCH] --- yaml --- r: 263697 b: refs/heads/master c: b91df1593e361109f1fe665ce17c5e87ca60582b h: refs/heads/master i: 263695: 88c849f489f3145a82f56c6497974c4c85237775 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sh_mobile_sdhi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0ee9252bbbbf..fec43c4e6110 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50a50f9248497484c678631a9c1a719f1aaeab79 +refs/heads/master: b91df1593e361109f1fe665ce17c5e87ca60582b diff --git a/trunk/drivers/mmc/host/sh_mobile_sdhi.c b/trunk/drivers/mmc/host/sh_mobile_sdhi.c index 774f6439d7ce..0c4a672f5db6 100644 --- a/trunk/drivers/mmc/host/sh_mobile_sdhi.c +++ b/trunk/drivers/mmc/host/sh_mobile_sdhi.c @@ -120,11 +120,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;