Merge branch 'fixes' into next

2 files changed, 22 insertions, 3 deletions

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index b95c3b0094fd..29fc1e662891 100644
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1223,7 +1223,7 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req)
                 break;
         }
         mq_rq->drv_op_result = ret;
-        blk_end_request_all(req, ret);
+        blk_end_request_all(req, ret ? BLK_STS_IOERR : BLK_STS_OK);
 }
 
 static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
@@ -1728,9 +1728,9 @@ static bool mmc_blk_rw_cmd_err(struct mmc_blk_data *md, struct mmc_card *card,
                 if (err)
                         req_pending = old_req_pending;
                 else
-                        req_pending = blk_end_request(req, 0, blocks << 9);
+                        req_pending = blk_end_request(req, BLK_STS_OK, blocks << 9);
         } else {
-                req_pending = blk_end_request(req, 0, brq->data.bytes_xfered);
+                req_pending = blk_end_request(req, BLK_STS_OK, brq->data.bytes_xfered);
         }
         return req_pending;
 }
diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
index 6012926b1aed..306ffaf7a5b2 100644
--- a/drivers/mmc/host/sdhci-xenon.c
+++ b/drivers/mmc/host/sdhci-xenon.c
@@ -210,8 +210,27 @@ static void xenon_set_uhs_signaling(struct sdhci_host *host,
         sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);
 }
 
+static void xenon_set_power(struct sdhci_host *host, unsigned char mode,
+                unsigned short vdd)
+{
+        struct mmc_host *mmc = host->mmc;
+        u8 pwr = host->pwr;
+
+        sdhci_set_power_noreg(host, mode, vdd);
+
+        if (host->pwr == pwr)
+                return;
+
+        if (host->pwr == 0)
+                vdd = 0;
+
+        if (!IS_ERR(mmc->supply.vmmc))
+                mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
+}
+
 static const struct sdhci_ops sdhci_xenon_ops = {
         .set_clock              = sdhci_set_clock,
+        .set_power              = xenon_set_power,
         .set_bus_width          = sdhci_set_bus_width,
         .reset                  = xenon_reset,
         .set_uhs_signaling      = xenon_set_uhs_signaling,