2010-12-15 13:19:27

by Takashi Iwai

Subject: [PATCH] mmc: Fix a typo in ocr_avail mask check for MMC

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 <[email protected]>
---
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

2010-12-16 23:45:15

by Chris Ball

Subject: Re: [PATCH] mmc: Fix a typo in ocr_avail mask check for MMC

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 <[email protected]>
> ---
> 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 <[email protected]> <http://printf.net/>
One Laptop Per Child

2010-12-17 08:12:09

by Takashi Iwai

Subject: Re: [PATCH] mmc: Fix a typo in ocr_avail mask check for MMC

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 <[email protected]>
> > ---
> > 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