diff options
| author | saturneric <[email protected]> | 2025-03-30 23:28:28 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2025-03-30 23:28:28 +0000 |
| commit | 4005cedb116bc25be160fd9f749c1c8f3059057b (patch) | |
| tree | ce3ece0cef561c6e969eca633b2cdb7360255714 /drivers/mmc/core/queue.c | |
| parent | Merge remote-tracking UNTIL 14. Jan 2025 (diff) | |
| parent | Linux 6.14 (diff) | |
| download | kernel-4005cedb116bc25be160fd9f749c1c8f3059057b.tar.gz kernel-4005cedb116bc25be160fd9f749c1c8f3059057b.zip | |
Merge remote-tracking UNTIL 24. Mar 2025
Diffstat (limited to 'drivers/mmc/core/queue.c')
| -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 6d99da3a22fb..bde63a566041 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -450,7 +450,7 @@ struct gendisk *mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, else mq->tag_set.queue_depth = MMC_QUEUE_DEPTH; mq->tag_set.numa_node = NUMA_NO_NODE; - mq->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_BLOCKING; + mq->tag_set.flags = BLK_MQ_F_BLOCKING; mq->tag_set.nr_hw_queues = 1; mq->tag_set.cmd_size = sizeof(struct mmc_queue_req); mq->tag_set.driver_data = mq; |