1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 5cf35e5ae267..3d7ebbb82318 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -28,6 +28,7 @@
 #include <linux/mmc/mmc.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
+#include <linux/mmc/sdio.h>
 #include <linux/mmc/slot-gpio.h>
 
 #include "sdhci.h"
@@ -931,7 +932,8 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host,
                  * If we are sending CMD23, CMD12 never gets sent
                  * on successful completion (so no Auto-CMD12).
                  */
-                if (!host->mrq->sbc && (host->flags & SDHCI_AUTO_CMD12))
+                if (!host->mrq->sbc && (host->flags & SDHCI_AUTO_CMD12) &&
+                    (cmd->opcode != SD_IO_RW_EXTENDED))
                         mode |= SDHCI_TRNS_AUTO_CMD12;
                 else if (host->mrq->sbc && (host->flags & SDHCI_AUTO_CMD23)) {
                         mode |= SDHCI_TRNS_AUTO_CMD23;