Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/sdmmc/sdhc.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/sdmmc/sdhc.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- src/sys/dev/sdmmc/sdhc.c	2012/07/26 18:36:09	1.26
+++ src/sys/dev/sdmmc/sdhc.c	2012/07/28 20:08:51	1.27
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhc.c,v 1.26 2012/07/26 18:36:09 matt Exp $	*/
+/*	$NetBSD: sdhc.c,v 1.27 2012/07/28 20:08:51 jakllsch 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.26 2012/07/26 18:36:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.27 2012/07/28 20:08:51 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -301,9 +301,10 @@ sdhc_host_found(struct sdhc_softc *sc, b
 	}
 
 	/* Use DMA if the host system and the controller support it. */
-	if (ISSET(sc->sc_flags, SDHC_FLAG_FORCE_DMA)
-	 || ((ISSET(sc->sc_flags, SDHC_FLAG_USE_DMA)
-	   && ISSET(caps, SDHC_DMA_SUPPORT)))) {
+	if ((hp->specver == SDHC_SPEC_VERS_100) &&
+	    (ISSET(sc->sc_flags, SDHC_FLAG_FORCE_DMA) ||
+	    (ISSET(sc->sc_flags, SDHC_FLAG_USE_DMA &&
+	     ISSET(caps, SDHC_DMA_SUPPORT))))) {
 		SET(hp->flags, SHF_USE_DMA);
 		aprint_normal_dev(sc->sc_dev, "using DMA transfer\n");
 	}
@@ -404,10 +405,7 @@ sdhc_host_found(struct sdhc_softc *sc, b
 	if (ISSET(caps, SDHC_HIGH_SPEED_SUPP))
 		saa.saa_caps |= SMC_CAPS_SD_HIGHSPEED;
 	if (ISSET(hp->flags, SHF_USE_DMA)) {
-		saa.saa_caps |= SMC_CAPS_DMA;
-		if (!ISSET(sc->sc_flags, SDHC_FLAG_ENHANCED)) {
-			saa.saa_caps |= SMC_CAPS_MULTI_SEG_DMA;
-		}
+		saa.saa_caps |= SMC_CAPS_DMA | SMC_CAPS_MULTI_SEG_DMA;
 	}
 	hp->sdmmc = config_found(sc->sc_dev, &saa, sdhc_cfprint);