diff options
Diffstat (limited to 'drivers/ide/ide-ioctls.c')
-rw-r--r-- | drivers/ide/ide-ioctls.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c index 8c0d17297a7a..3661abb16a5f 100644 --- a/drivers/ide/ide-ioctls.c +++ b/drivers/ide/ide-ioctls.c | |||
@@ -126,7 +126,6 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg) | |||
126 | struct request *rq; | 126 | struct request *rq; |
127 | 127 | ||
128 | rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, __GFP_RECLAIM); | 128 | rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, __GFP_RECLAIM); |
129 | scsi_req_init(rq); | ||
130 | ide_req(rq)->type = ATA_PRIV_TASKFILE; | 129 | ide_req(rq)->type = ATA_PRIV_TASKFILE; |
131 | blk_execute_rq(drive->queue, NULL, rq, 0); | 130 | blk_execute_rq(drive->queue, NULL, rq, 0); |
132 | err = scsi_req(rq)->result ? -EIO : 0; | 131 | err = scsi_req(rq)->result ? -EIO : 0; |
@@ -224,7 +223,6 @@ static int generic_drive_reset(ide_drive_t *drive) | |||
224 | int ret = 0; | 223 | int ret = 0; |
225 | 224 | ||
226 | rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, __GFP_RECLAIM); | 225 | rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, __GFP_RECLAIM); |
227 | scsi_req_init(rq); | ||
228 | ide_req(rq)->type = ATA_PRIV_MISC; | 226 | ide_req(rq)->type = ATA_PRIV_MISC; |
229 | scsi_req(rq)->cmd_len = 1; | 227 | scsi_req(rq)->cmd_len = 1; |
230 | scsi_req(rq)->cmd[0] = REQ_DRIVE_RESET; | 228 | scsi_req(rq)->cmd[0] = REQ_DRIVE_RESET; |