Commit 937fb531 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents db1af1e9 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);

}