Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / ide / ide-taskfile.c

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index a716693417a308c49186bcfb4e692aa86ef1d99d..247b9faccce171d607b275e4849dc28d9c8d1f23 100644 (file)
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -428,10 +428,12 @@ int ide_raw_taskfile(ide_drive_t *drive, struct ide_cmd *cmd, u8 *buf,
 {
        struct request *rq;
        int error;
-       int rw = !(cmd->tf_flags & IDE_TFLAG_WRITE) ? READ : WRITE;
 
-       rq = blk_get_request(drive->queue, rw, __GFP_RECLAIM);
-       rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
+       rq = blk_get_request(drive->queue,
+               (cmd->tf_flags & IDE_TFLAG_WRITE) ?
+                       REQ_OP_DRV_OUT : REQ_OP_DRV_IN, __GFP_RECLAIM);
+       scsi_req_init(rq);
+       ide_req(rq)->type = ATA_PRIV_TASKFILE;
 
        /*
         * (ks) We transfer currently only whole sectors.