Message ID | 20190424102331.31624-4-kai.heng.feng@canonical.com |
---|---|
State | New |
Headers | show |
Series | Fix for LP: #1815733 | expand |
diff --git a/block/elevator.c b/block/elevator.c index 89a48a3a8c12..14259a524250 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -1090,8 +1090,11 @@ static int __elevator_change(struct request_queue *q, const char *name) /* * Special case for mq, turn off scheduling */ - if (q->mq_ops && !strncmp(name, "none", 4)) + if (q->mq_ops && !strncmp(name, "none", 4)) { + if (!q->elevator) + return 0; return elevator_switch(q, NULL); + } strlcpy(elevator_name, name, sizeof(elevator_name)); e = elevator_get(q, strstrip(elevator_name), true);