Input: edt-ft5x06 - add a missing condition

[karo-tx-linux.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index fce4b9387f36bc465d9fbcca8531ec1eb6b9d4fc..25f13479f552562bc2e406f3ebed2bf150e93fe9 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1429,6 +1429,9 @@ static bool attempt_plug_merge(struct request_queue *q, struct bio *bio,
        struct request *rq;
        bool ret = false;
 
+       if (blk_queue_nomerges(q))
+               goto out;
+
        plug = current->plug;
        if (!plug)
                goto out;