goto out;
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
-@@ -1807,7 +1807,8 @@ EXPORT_SYMBOL(mmc_erase);
+@@ -1812,7 +1812,8 @@ EXPORT_SYMBOL(mmc_erase);
int mmc_can_erase(struct mmc_card *card)
{
#define MAX_TUNING_LOOP 40
-@@ -3143,7 +3143,7 @@ static void sdhci_timeout_timer(struct t
+@@ -3188,7 +3188,7 @@ static void sdhci_timeout_timer(struct t
spin_lock_irqsave(&host->lock, flags);
if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
mmc_hostname(host->mmc));
sdhci_dumpregs(host);
-@@ -3165,7 +3165,7 @@ static void sdhci_timeout_data_timer(str
+@@ -3210,7 +3210,7 @@ static void sdhci_timeout_data_timer(str
if (host->data || host->data_cmd ||
(host->cmd && sdhci_data_line_cmd(host->cmd))) {