diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2024-03-05 14:49:56 +0300 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2024-03-05 14:49:56 +0300 |
| commit | 2f7c99528ae302f9e8b2cbcc5d6f40e2792578f7 (patch) | |
| tree | 98c65692fdfcab7839289264a0f63c7a948959e7 /drivers/mmc | |
| parent | 6e860b05a0cbb585a75d76923b062b51b89a409e (diff) | |
| parent | e8d1b41e69d72c62865bebe8f441163ec00b3d44 (diff) | |
| download | linux-2f7c99528ae302f9e8b2cbcc5d6f40e2792578f7.tar.xz | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.8-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.9.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/tmio_mmc_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index be7f18fd4836..c253d176db69 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -259,6 +259,8 @@ static void tmio_mmc_reset_work(struct work_struct *work) else mrq->cmd->error = -ETIMEDOUT; + /* No new calls yet, but disallow concurrent tmio_mmc_done_work() */ + host->mrq = ERR_PTR(-EBUSY); host->cmd = NULL; host->data = NULL; |