svn commit: r331039 - stable/10/sys/dev/mmc

[Marius Strobl]

Author: marius
Date: Thu Mar 15 23:02:52 2018
New Revision: 331039
URL: https://svnweb.freebsd.org/changeset/base/331039

Log:
  MFC: r327929
  
  Use the correct revision specifier (EXT_CSD revision rather than
  system specification version) for deciding whether the EXT_CSD
  register includes the EXT_CSD_GEN_CMD6_TIME field.
  
  Submitted by:	Masanobu SAITOH

Modified:
  stable/10/sys/dev/mmc/mmc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/mmc/mmc.c
==============================================================================
--- stable/10/sys/dev/mmc/mmc.c	Thu Mar 15 23:02:49 2018	(r331038)
+++ stable/10/sys/dev/mmc/mmc.c	Thu Mar 15 23:02:52 2018	(r331039)
@@ -1870,7 +1870,7 @@ mmc_discover_cards(struct mmc_softc *sc)
 			 * units of 10 ms), defaulting to 500 ms.
 			 */
 			ivar->cmd6_time = 500 * 1000;
-			if (ivar->csd.spec_vers >= 6)
+			if (ivar->raw_ext_csd[EXT_CSD_REV] >= 6)
 				ivar->cmd6_time = 10 *
 				    ivar->raw_ext_csd[EXT_CSD_GEN_CMD6_TIME];
 			/* Handle HC erase sector size. */