Merge branches 'pm-devfreq' and 'pm-cpufreq'

* pm-devfreq:
  PM / devfreq: fix double kfree
  PM / devfreq: Fix governor_store()

* pm-cpufreq:
  cpufreq: prevent lockup on reading scaling_available_frequencies
  cpufreq: acpi_cpufreq: prevent crash on reading freqdomain_cpus

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 0520064dc33b..a3eb20bdcd97 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -134,9 +134,11 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq)
         int err = cmd->error;
 
         /* Flag re-tuning needed on CRC errors */
-        if (err == -EILSEQ || (mrq->sbc && mrq->sbc->error == -EILSEQ) ||
+        if ((cmd->opcode != MMC_SEND_TUNING_BLOCK &&
+            cmd->opcode != MMC_SEND_TUNING_BLOCK_HS200) &&
+            (err == -EILSEQ || (mrq->sbc && mrq->sbc->error == -EILSEQ) ||
             (mrq->data && mrq->data->error == -EILSEQ) ||
-            (mrq->stop && mrq->stop->error == -EILSEQ))
+            (mrq->stop && mrq->stop->error == -EILSEQ)))
                 mmc_retune_needed(host);
 
         if (err && cmd->retries && mmc_host_is_spi(host)) {