diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2023-12-07 15:15:02 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2023-12-07 15:15:02 +0100 |
| commit | 72cd89517fa0a33adb4764c34c7b268f4d23882b (patch) | |
| tree | dcb9edf0a20cd5aabeb97e1cc197fea48ab4e2cb /drivers/mmc/core | |
| parent | d3ddafd34bc4e353dc9fc2d193abc4c4463dc588 (diff) | |
| parent | 1036f69e251380573e256568cf814506e3fb9988 (diff) | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.7-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.8.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/host.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 096093f7be00..2f51db4df1a8 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -692,6 +692,7 @@ EXPORT_SYMBOL(mmc_remove_host); */ void mmc_free_host(struct mmc_host *host) { + cancel_delayed_work_sync(&host->detect); mmc_pwrseq_free(host); put_device(&host->class_dev); } |