Commit f318052e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v5.9-rc4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fix from Ulf Hansson:
 "Assign a proper discard granularity rather than incorrectly set it to
  zero"

* tag 'mmc-v5.9-rc4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: core: don't set limits.discard_granularity as 0
parents fd330b1b 42432191

drivers/mmc/core/queue.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE