diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2020-10-09 08:58:30 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2020-10-09 08:58:30 +0200 |
| commit | 937fb531d3b7da1f5686ee7e1b6f6ac5f5cbbcb0 (patch) | |
| tree | a1b38ab33c9e62edde50b978cda5d1e4ea528d5b /drivers/mmc/core | |
| parent | mmc: renesas_sdhi: workaround a regression when reinserting SD cards (diff) | |
| parent | mmc: core: don't set limits.discard_granularity as 0 (diff) | |
| download | linux-937fb531d3b7da1f5686ee7e1b6f6ac5f5cbbcb0.tar.xz linux-937fb531d3b7da1f5686ee7e1b6f6ac5f5cbbcb0.zip | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index 6c022ef0f84d..350d0cc4ee62 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -190,7 +190,7 @@ static void mmc_queue_setup_discard(struct request_queue *q, q->limits.discard_granularity = card->pref_erase << 9; /* granularity must not be greater than max. discard */ if (card->pref_erase > max_discard) - q->limits.discard_granularity = 0; + q->limits.discard_granularity = SECTOR_SIZE; if (mmc_can_secure_erase_trim(card)) blk_queue_flag_set(QUEUE_FLAG_SECERASE, q); } |