Skip to contentSkip to conversation

mmc: Fix a typo in ocr_avail mask check for MMC

PATCH In review Takashi Iwai 2 participants 3 messages Dec 15, 2010 – Dec 17, 2010

Subsystems (2)
MMC, SD and SDIO Secure digital host controller interface (SDHCI) driver
lore
Share & tools
lore

Takashi Iwai

author
#0 lore raw

PATCH 1/1 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(-)
drivers/mmc/host/sdhci.c +1 -1
index 51f5209..be0ff14 100644
@@ -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 "
Signature · 1 line
1.7.3.1
#1 lore raw

Hi Takashi,

Quoted 13 lines · Takashi Iwai

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(-)
drivers/mmc/host/sdhci.c +0 -0
index 51f5209..be0ff14 100644

drivers/mmc/host/sdhci.c int sdhci_add_host(struct sdhci_host *host) · line 1925

Quoted 8 lines
drivers/mmc/host/sdhci.c +1 -1
@@ -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.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
author
#2 lore raw

At Thu, 16 Dec 2010 23:45:11 +0000,

Quoted 23 lines · Chris Ball

Hi Takashi,

Quoted 19 lines · Takashi Iwai

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(-)
drivers/mmc/host/sdhci.c +1 -1
index 51f5209..be0ff14 100644
@@ -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;
Quoted 5 lines

drivers/mmc/host/sdhci.c int sdhci_add_host(struct sdhci_host *host) · line 1925

Quoted 2 lines
drivers/mmc/host/sdhci.c +0 -0
 	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