All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mmc: sdhi: initialise mmc_data->flags before use
@ 2011-08-19  1:07 ` Simon Horman
  0 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2011-08-19  1:07 UTC (permalink / raw)
  To: linux-mmc, linux-sh
  Cc: Chris Ball, Guennadi Liakhovetski, Magnus Damm, Simon Horman

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;
 
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH] mmc: sdhi: initialise mmc_data->flags before use
@ 2011-08-19  1:07 ` Simon Horman
  0 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2011-08-19  1:07 UTC (permalink / raw)
  To: linux-mmc, linux-sh
  Cc: Chris Ball, Guennadi Liakhovetski, Magnus Damm, Simon Horman

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;
 
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH] mmc: sdhi: initialise mmc_data->flags before use
  2011-08-19  1:07 ` Simon Horman
@ 2011-08-19  3:04   ` Magnus Damm
  -1 siblings, 0 replies; 10+ messages in thread
From: Magnus Damm @ 2011-08-19  3:04 UTC (permalink / raw)
  To: Simon Horman; +Cc: linux-mmc, linux-sh, Chris Ball, Guennadi Liakhovetski

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

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] mmc: sdhi: initialise mmc_data->flags before use
@ 2011-08-19  3:04   ` Magnus Damm
  0 siblings, 0 replies; 10+ messages in thread
From: Magnus Damm @ 2011-08-19  3:04 UTC (permalink / raw)
  To: Simon Horman; +Cc: linux-mmc, linux-sh, Chris Ball, Guennadi Liakhovetski

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

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] mmc: sdhi: initialise mmc_data->flags before use
  2011-08-19  3:04   ` Magnus Damm
@ 2011-08-19  3:26     ` Simon Horman
  -1 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2011-08-19  3:26 UTC (permalink / raw)
  To: Magnus Damm; +Cc: linux-mmc, linux-sh, Chris Ball, Guennadi Liakhovetski

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.

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] mmc: sdhi: initialise mmc_data->flags before use
@ 2011-08-19  3:26     ` Simon Horman
  0 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2011-08-19  3:26 UTC (permalink / raw)
  To: Magnus Damm; +Cc: linux-mmc, linux-sh, Chris Ball, Guennadi Liakhovetski

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.

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] mmc: sdhi: initialise mmc_data->flags before use
  2011-08-19  3:04   ` Magnus Damm
@ 2011-08-19  7:06     ` Guennadi Liakhovetski
  -1 siblings, 0 replies; 10+ messages in thread
From: Guennadi Liakhovetski @ 2011-08-19  7:06 UTC (permalink / raw)
  To: Magnus Damm; +Cc: Simon Horman, linux-mmc, linux-sh, Chris Ball

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/

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] mmc: sdhi: initialise mmc_data->flags before use
@ 2011-08-19  7:06     ` Guennadi Liakhovetski
  0 siblings, 0 replies; 10+ messages in thread
From: Guennadi Liakhovetski @ 2011-08-19  7:06 UTC (permalink / raw)
  To: Magnus Damm; +Cc: Simon Horman, linux-mmc, linux-sh, Chris Ball

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/

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] mmc: sdhi: initialise mmc_data->flags before use
  2011-08-19  1:07 ` Simon Horman
@ 2011-08-19 17:18   ` Chris Ball
  -1 siblings, 0 replies; 10+ messages in thread
From: Chris Ball @ 2011-08-19 17:18 UTC (permalink / raw)
  To: Simon Horman; +Cc: linux-mmc, linux-sh, Guennadi Liakhovetski, Magnus Damm

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.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] mmc: sdhi: initialise mmc_data->flags before use
@ 2011-08-19 17:18   ` Chris Ball
  0 siblings, 0 replies; 10+ messages in thread
From: Chris Ball @ 2011-08-19 17:18 UTC (permalink / raw)
  To: Simon Horman; +Cc: linux-mmc, linux-sh, Guennadi Liakhovetski, Magnus Damm

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.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-08-20 18:07 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-19  1:07 [PATCH] mmc: sdhi: initialise mmc_data->flags before use Simon Horman
2011-08-19  1:07 ` Simon Horman
2011-08-19  3:04 ` Magnus Damm
2011-08-19  3:04   ` Magnus Damm
2011-08-19  3:26   ` Simon Horman
2011-08-19  3:26     ` Simon Horman
2011-08-19  7:06   ` Guennadi Liakhovetski
2011-08-19  7:06     ` Guennadi Liakhovetski
2011-08-19 17:18 ` Chris Ball
2011-08-19 17:18   ` Chris Ball

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.