Module Name: src
Committed By: jmcneill
Date: Mon Aug 3 00:19:27 UTC 2015
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
dont confuse signaling voltage and bus voltage
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/sdmmc/sdhc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.72 src/sys/dev/sdmmc/sdhc.c:1.73
--- src/sys/dev/sdmmc/sdhc.c:1.72 Sun Aug 2 22:01:28 2015
+++ src/sys/dev/sdmmc/sdhc.c Mon Aug 3 00:19:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.72 2015/08/02 22:01:28 jmcneill Exp $ */
+/* $NetBSD: sdhc.c,v 1.73 2015/08/03 00:19:27 jmcneill Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.72 2015/08/02 22:01:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.73 2015/08/03 00:19:27 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -832,7 +832,7 @@ sdhc_bus_power(sdmmc_chipset_handle_t sc
* Select the lowest voltage according to capabilities.
*/
ocr &= hp->ocr;
- if (ISSET(ocr, MMC_OCR_1_7V_1_8V|MMC_OCR_1_8V_1_9V|MMC_OCR_S18A)) {
+ if (ISSET(ocr, MMC_OCR_1_7V_1_8V|MMC_OCR_1_8V_1_9V)) {
vdd = SDHC_VOLTAGE_1_8V;
} else if (ISSET(ocr, MMC_OCR_2_9V_3_0V|MMC_OCR_3_0V_3_1V)) {
vdd = SDHC_VOLTAGE_3_0V;
