Merge tag 'linux-kselftest-next-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kerne...

[linux-2.6-microblaze.git] / drivers / mmc / core / core.c

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 19f1ee5..1136b85 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -37,6 +37,7 @@
 
 #include "core.h"
 #include "card.h"
+#include "crypto.h"
 #include "bus.h"
 #include "host.h"
 #include "sdio_bus.h"
@@ -547,10 +548,10 @@ int mmc_cqe_recovery(struct mmc_host *host)
        host->cqe_ops->cqe_recovery_start(host);
 
        memset(&cmd, 0, sizeof(cmd));
-       cmd.opcode       = MMC_STOP_TRANSMISSION,
-       cmd.flags        = MMC_RSP_R1B | MMC_CMD_AC,
+       cmd.opcode       = MMC_STOP_TRANSMISSION;
+       cmd.flags        = MMC_RSP_R1B | MMC_CMD_AC;
        cmd.flags       &= ~MMC_RSP_CRC; /* Ignore CRC */
-       cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT,
+       cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT;
        mmc_wait_for_cmd(host, &cmd, 0);
 
        memset(&cmd, 0, sizeof(cmd));
@@ -558,7 +559,7 @@ int mmc_cqe_recovery(struct mmc_host *host)
        cmd.arg          = 1; /* Discard entire queue */
        cmd.flags        = MMC_RSP_R1B | MMC_CMD_AC;
        cmd.flags       &= ~MMC_RSP_CRC; /* Ignore CRC */
-       cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT,
+       cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT;
        err = mmc_wait_for_cmd(host, &cmd, 0);
 
        host->cqe_ops->cqe_recovery_finish(host);
@@ -992,6 +993,8 @@ void mmc_set_initial_state(struct mmc_host *host)
                host->ops->hs400_enhanced_strobe(host, &host->ios);
 
        mmc_set_ios(host);
+
+       mmc_crypto_set_initial_state(host);
 }
 
 /**