svn commit: r183709 - head/sys/dev/mmc

[Alexander Motin]

Author: mav
Date: Wed Oct  8 21:10:55 2008
New Revision: 183709
URL: http://svn.freebsd.org/changeset/base/183709

Log:
  Only voltage bits should be zero in send_op_cond argument to ignore busy.

Modified:
  head/sys/dev/mmc/mmc.c

Modified: head/sys/dev/mmc/mmc.c
==============================================================================
--- head/sys/dev/mmc/mmc.c	Wed Oct  8 20:00:51 2008	(r183708)
+++ head/sys/dev/mmc/mmc.c	Wed Oct  8 21:10:55 2008	(r183709)
@@ -428,7 +428,8 @@ mmc_send_app_op_cond(struct mmc_softc *s
 		err = mmc_wait_for_app_cmd(sc, 0, &cmd, CMD_RETRIES);
 		if (err != MMC_ERR_NONE)
 			break;
-		if ((cmd.resp[0] & MMC_OCR_CARD_BUSY) || ocr == 0)
+		if ((cmd.resp[0] & MMC_OCR_CARD_BUSY) ||
+		    (ocr & MMC_OCR_VOLTAGE) == 0)
 			break;
 		err = MMC_ERR_TIMEOUT;
 		mmc_ms_delay(10);
@@ -454,7 +455,8 @@ mmc_send_op_cond(struct mmc_softc *sc, u
 		err = mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES);
 		if (err != MMC_ERR_NONE)
 			break;
-		if ((cmd.resp[0] & MMC_OCR_CARD_BUSY) || ocr == 0)
+		if ((cmd.resp[0] & MMC_OCR_CARD_BUSY) ||
+		    (ocr & MMC_OCR_VOLTAGE) == 0)
 			break;
 		err = MMC_ERR_TIMEOUT;
 		mmc_ms_delay(10);