ide: clear ide_req()->special for non-passthrough requests

[linux-2.6-microblaze.git] / drivers / ide / ide-io.c

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c0dd0fa..8445b48 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -463,6 +463,11 @@ blk_status_t ide_queue_rq(struct blk_mq_hw_ctx *hctx,
        struct request  *rq = bd->rq;
        ide_startstop_t startstop;
 
+       if (!blk_rq_is_passthrough(rq) && !(rq->rq_flags & RQF_DONTPREP)) {
+               rq->rq_flags |= RQF_DONTPREP;
+               ide_req(rq)->special = NULL;
+       }
+
        /* HLD do_request() callback might sleep, make sure it's okay */
        might_sleep();