Message ID | 1313716027-19470-1-git-send-email-horms@verge.net.au (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
On Fri, Aug 19, 2011 at 10:07 AM, Simon Horman <horms@verge.net.au> wrote: > This corrects a logic error that I introduced in > "mmc: sdhi: Add write16_hook" > > Reported-by: Magnus Damm <magnus.damm@gmail.com> > Signed-off-by: Simon Horman <horms@verge.net.au> > --- > drivers/mmc/host/sh_mobile_sdhi.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Hi Simon, Thanks for providing a fix for this issue. Correct me if I'm wrong, but I believe this patch is suitable for 3.1-rc. So it would be great to have it merged rather soon as a fix instead of delaying it to 3.2. Thanks, / magnus -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Aug 19, 2011 at 12:04:06PM +0900, Magnus Damm wrote: > On Fri, Aug 19, 2011 at 10:07 AM, Simon Horman <horms@verge.net.au> wrote: > > This corrects a logic error that I introduced in > > "mmc: sdhi: Add write16_hook" > > > > Reported-by: Magnus Damm <magnus.damm@gmail.com> > > Signed-off-by: Simon Horman <horms@verge.net.au> > > --- > > drivers/mmc/host/sh_mobile_sdhi.c | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > Hi Simon, > > Thanks for providing a fix for this issue. Correct me if I'm wrong, > but I believe this patch is suitable for 3.1-rc. So it would be great > to have it merged rather soon as a fix instead of delaying it to 3.2. Yes, I agree. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 19 Aug 2011, Magnus Damm wrote: > On Fri, Aug 19, 2011 at 10:07 AM, Simon Horman <horms@verge.net.au> wrote: > > This corrects a logic error that I introduced in > > "mmc: sdhi: Add write16_hook" > > > > Reported-by: Magnus Damm <magnus.damm@gmail.com> > > Signed-off-by: Simon Horman <horms@verge.net.au> > > --- > > drivers/mmc/host/sh_mobile_sdhi.c | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > Hi Simon, > > Thanks for providing a fix for this issue. Correct me if I'm wrong, > but I believe this patch is suitable for 3.1-rc. So it would be great > to have it merged rather soon as a fix instead of delaying it to 3.2. Indeed: Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Chris, please, push for 3.1. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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@gmail.com> > Signed-off-by: Simon Horman <horms@verge.net.au> > --- > 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.
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;
This corrects a logic error that I introduced in "mmc: sdhi: Add write16_hook" Reported-by: Magnus Damm <magnus.damm@gmail.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- drivers/mmc/host/sh_mobile_sdhi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)