[src/trunk]: src/sys/dev/sdmmc dont confuse signaling voltage and bus voltage

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/be23ce1bc40b
branches:  trunk
changeset: 339678:be23ce1bc40b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Aug 03 00:19:27 2015 +0000

description:
dont confuse signaling voltage and bus voltage

diffstat:

 sys/dev/sdmmc/sdhc.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r f65af7ac740f -r be23ce1bc40b sys/dev/sdmmc/sdhc.c
--- a/sys/dev/sdmmc/sdhc.c      Sun Aug 02 22:47:05 2015 +0000
+++ b/sys/dev/sdmmc/sdhc.c      Mon Aug 03 00:19:27 2015 +0000
@@ -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 @@
         * 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;