Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[deliverable/linux.git] / block / blk-exec.c

diff --git a/block/blk-exec.c b/block/blk-exec.c
index dbf4502b1d6779eadd1573f28f75def4e26a031a..f4d27b12c90b2778182cc3c0cf5a6cd09e2b0310 100644 (file)
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -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);