pinctrl: rockchip: enable iomuxes from pmu space

[firefly-linux-kernel-4.4.55.git] / block / blk-exec.c

diff --git a/block/blk-exec.c b/block/blk-exec.c
index c68613bb4c79b718b87dd5dc90b3a8cdd307c3fc..f4d27b12c90b2778182cc3c0cf5a6cd09e2b0310 100644 (file)
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -65,7 +65,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
         * be resued after dying flag is set
         */
        if (q->mq_ops) {
-               blk_mq_insert_request(q, rq, at_head, true);
+               blk_mq_insert_request(rq, at_head, true, false);
                return;
        }
 
@@ -132,6 +132,11 @@ int blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk,
        if (rq->errors)
                err = -EIO;
 
+       if (rq->sense == sense) {
+               rq->sense = NULL;
+               rq->sense_len = 0;
+       }
+
        return err;
 }
 EXPORT_SYMBOL(blk_execute_rq);