public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mmc: Fix a typo in ocr_avail mask check for MMC
@ 2010-12-15 13:19 Takashi Iwai
  2010-12-16 23:45 ` Chris Ball
  0 siblings, 1 reply; 3+ messages in thread
From: Takashi Iwai @ 2010-12-15 13:19 UTC (permalink / raw)
  To: Chris Ball; +Cc: Aries Lee, linux-mmc, linux-kernel

In the patch "mmc: Add support for JMicron 388 SD/MMC controller",
I changed a wrong field for MMC during rewrite.  Fixed now.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/mmc/host/sdhci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 51f5209..be0ff14 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1919,7 +1919,7 @@ int sdhci_add_host(struct sdhci_host *host)
 		mmc->ocr_avail_sd &= ~MMC_VDD_165_195;
 	mmc->ocr_avail_mmc = ocr_avail;
 	if (host->ocr_avail_mmc)
-		mmc->ocr_avail_sd &= host->ocr_avail_mmc;
+		mmc->ocr_avail_mmc &= host->ocr_avail_mmc;
 
 	if (mmc->ocr_avail == 0) {
 		printk(KERN_ERR "%s: Hardware doesn't report any "
-- 
1.7.3.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] mmc: Fix a typo in ocr_avail mask check for MMC
  2010-12-15 13:19 [PATCH] mmc: Fix a typo in ocr_avail mask check for MMC Takashi Iwai
@ 2010-12-16 23:45 ` Chris Ball
  2010-12-17  8:12   ` Takashi Iwai
  0 siblings, 1 reply; 3+ messages in thread
From: Chris Ball @ 2010-12-16 23:45 UTC (permalink / raw)
  To: Takashi Iwai; +Cc: Aries Lee, linux-mmc, linux-kernel

Hi Takashi,

On Wed, Dec 15, 2010 at 02:19:22PM +0100, Takashi Iwai wrote:
> In the patch "mmc: Add support for JMicron 388 SD/MMC controller",
> I changed a wrong field for MMC during rewrite.  Fixed now.
> 
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>  drivers/mmc/host/sdhci.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 51f5209..be0ff14 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1919,7 +1919,7 @@ int sdhci_add_host(struct sdhci_host *host)
>  		mmc->ocr_avail_sd &= ~MMC_VDD_165_195;
>  	mmc->ocr_avail_mmc = ocr_avail;
>  	if (host->ocr_avail_mmc)
> -		mmc->ocr_avail_sd &= host->ocr_avail_mmc;
> +		mmc->ocr_avail_mmc &= host->ocr_avail_mmc;
>  
>  	if (mmc->ocr_avail == 0) {
>  		printk(KERN_ERR "%s: Hardware doesn't report any "

Thanks, I've rebased this change into the original patch on my mmc-next
branch.

-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mmc: Fix a typo in ocr_avail mask check for MMC
  2010-12-16 23:45 ` Chris Ball
@ 2010-12-17  8:12   ` Takashi Iwai
  0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2010-12-17  8:12 UTC (permalink / raw)
  To: Chris Ball; +Cc: Aries Lee, linux-mmc, linux-kernel

At Thu, 16 Dec 2010 23:45:11 +0000,
Chris Ball wrote:
> 
> Hi Takashi,
> 
> On Wed, Dec 15, 2010 at 02:19:22PM +0100, Takashi Iwai wrote:
> > In the patch "mmc: Add support for JMicron 388 SD/MMC controller",
> > I changed a wrong field for MMC during rewrite.  Fixed now.
> > 
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > ---
> >  drivers/mmc/host/sdhci.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> > index 51f5209..be0ff14 100644
> > --- a/drivers/mmc/host/sdhci.c
> > +++ b/drivers/mmc/host/sdhci.c
> > @@ -1919,7 +1919,7 @@ int sdhci_add_host(struct sdhci_host *host)
> >  		mmc->ocr_avail_sd &= ~MMC_VDD_165_195;
> >  	mmc->ocr_avail_mmc = ocr_avail;
> >  	if (host->ocr_avail_mmc)
> > -		mmc->ocr_avail_sd &= host->ocr_avail_mmc;
> > +		mmc->ocr_avail_mmc &= host->ocr_avail_mmc;
> >  
> >  	if (mmc->ocr_avail == 0) {
> >  		printk(KERN_ERR "%s: Hardware doesn't report any "
> 
> Thanks, I've rebased this change into the original patch on my mmc-next
> branch.

OK, thanks!


Takashi

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-12-17  8:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-15 13:19 [PATCH] mmc: Fix a typo in ocr_avail mask check for MMC Takashi Iwai
2010-12-16 23:45 ` Chris Ball
2010-12-17  8:12   ` Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox