Merge 4.14.7 into android-4.14

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / block / blk-settings.c

diff --git a/block/blk-settings.c b/block/blk-settings.c
index be1f115b538b3f874a8db5fd4eef000621821ad6..8559e9563c5255f114309e95a9d09b71550d0af2 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -68,6 +68,7 @@ EXPORT_SYMBOL_GPL(blk_queue_rq_timeout);
 
 void blk_queue_rq_timed_out(struct request_queue *q, rq_timed_out_fn *fn)
 {
+       WARN_ON_ONCE(q->mq_ops);
        q->rq_timed_out_fn = fn;
 }
 EXPORT_SYMBOL_GPL(blk_queue_rq_timed_out);