Merge tag 'drm-misc-next-fixes-2021-05-06' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / block / blk-sysfs.c

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index ae39c7f..0f4f0c8 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -434,10 +434,13 @@ static ssize_t queue_poll_store(struct request_queue *q, const char *page,
        if (ret < 0)
                return ret;
 
-       if (poll_on)
+       if (poll_on) {
                blk_queue_flag_set(QUEUE_FLAG_POLL, q);
-       else
+       } else {
+               blk_mq_freeze_queue(q);
                blk_queue_flag_clear(QUEUE_FLAG_POLL, q);
+               blk_mq_unfreeze_queue(q);
+       }
 
        return ret;
 }