diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2022-09-28 11:09:29 +0300 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2022-09-28 11:09:29 +0300 |
| commit | 178422c27badb8eee5edfae3f6cc3048cc140364 (patch) | |
| tree | 3b29c7d85d52b81c4fcc7d8e80b223d06b9b49f3 /drivers/mmc | |
| parent | 1e63d2973ea39ffebd829de632b6b2336d59f41f (diff) | |
| parent | e7afa79a3b35a27a046a2139f8b20bd6b98155c2 (diff) | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.0rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.1.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mmc_hsq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/mmc_hsq.c b/drivers/mmc/host/mmc_hsq.c index a5e05ed0fda3..9d35453e7371 100644 --- a/drivers/mmc/host/mmc_hsq.c +++ b/drivers/mmc/host/mmc_hsq.c @@ -34,7 +34,7 @@ static void mmc_hsq_pump_requests(struct mmc_hsq *hsq) spin_lock_irqsave(&hsq->lock, flags); /* Make sure we are not already running a request now */ - if (hsq->mrq) { + if (hsq->mrq || hsq->recovery_halt) { spin_unlock_irqrestore(&hsq->lock, flags); return; } |