diff options
author | Takashi Iwai <tiwai@suse.de> | 2024-12-12 14:49:35 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2024-12-12 14:49:35 +0100 |
commit | 7b26bc6582b13a52a42a4a9765e8f30d58a81198 (patch) | |
tree | 80737d9bb4abf42b8e2061a5edacdfbe5ac9b7d6 /drivers/mmc/core/core.c | |
parent | b2e538a9827dd04ab5273bf4be8eb2edb84357b0 (diff) | |
parent | 255cc582e6e16191a20d54bcdbca6c91d3e90c5e (diff) | |
download | linux-7b26bc6582b13a52a42a4a9765e8f30d58a81198.tar.gz linux-7b26bc6582b13a52a42a4a9765e8f30d58a81198.tar.bz2 linux-7b26bc6582b13a52a42a4a9765e8f30d58a81198.zip |
Merge tag 'asoc-fix-v6.12-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.13
A small pile of driver specific fixes, all quite small and not
particularly major.
Diffstat (limited to 'drivers/mmc/core/core.c')
-rw-r--r-- | drivers/mmc/core/core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index a499f3c59de5..d996d39c0d6f 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2335,6 +2335,9 @@ void mmc_start_host(struct mmc_host *host) void __mmc_stop_host(struct mmc_host *host) { + if (host->rescan_disable) + return; + if (host->slot.cd_irq >= 0) { mmc_gpio_set_cd_wake(host, false); disable_irq(host->slot.cd_irq); |