Skip to content

Commit 2f7c995

Browse files
committed
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 <[email protected]>
2 parents 6e860b0 + e8d1b41 commit 2f7c995

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/mmc/host/tmio_mmc_core.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ static void tmio_mmc_reset_work(struct work_struct *work)
259259
else
260260
mrq->cmd->error = -ETIMEDOUT;
261261

262+
/* No new calls yet, but disallow concurrent tmio_mmc_done_work() */
263+
host->mrq = ERR_PTR(-EBUSY);
262264
host->cmd = NULL;
263265
host->data = NULL;
264266

0 commit comments

Comments
 (0)