diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2025-06-25 14:44:44 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2025-06-25 14:44:44 +0200 |
| commit | 15b8c45f982a7bf6cd3114e905414aabc5508fb6 (patch) | |
| tree | 6e441201ba6ef0672a01cf4a7f7d30336225cff7 | |
| parent | 115ed5cb58ee4bab72a3d25dff9a98ff441b684a (diff) | |
| parent | ec54c0a20709ed6e56f40a8d59eee725c31a916b (diff) | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.16-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.17.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
| -rw-r--r-- | drivers/mmc/host/mtk-sd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index b12cfb9a5e5f..d7020e06dd55 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -1492,6 +1492,7 @@ static void msdc_ops_request(struct mmc_host *mmc, struct mmc_request *mrq) if (mrq->data) { msdc_prepare_data(host, mrq->data); if (!msdc_data_prepared(mrq->data)) { + host->mrq = NULL; /* * Failed to prepare DMA area, fail fast before * starting any commands. |