aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/ide-cd_ioctl.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c
index 851277074302..24d002addf73 100644
--- a/drivers/ide/ide-cd_ioctl.c
+++ b/drivers/ide/ide-cd_ioctl.c
@@ -296,14 +296,14 @@ int ide_cdrom_reset(struct cdrom_device_info *cdi)
296 ide_drive_t *drive = cdi->handle; 296 ide_drive_t *drive = cdi->handle;
297 struct cdrom_info *cd = drive->driver_data; 297 struct cdrom_info *cd = drive->driver_data;
298 struct request_sense sense; 298 struct request_sense sense;
299 struct request req; 299 struct request *rq;
300 int ret; 300 int ret;
301 301
302 ide_cd_init_rq(drive, &req); 302 rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
303 req.cmd_type = REQ_TYPE_SPECIAL; 303 rq->cmd_type = REQ_TYPE_SPECIAL;
304 req.cmd_flags = REQ_QUIET; 304 rq->cmd_flags = REQ_QUIET;
305 ret = ide_do_drive_cmd(drive, &req, ide_wait); 305 ret = blk_execute_rq(drive->queue, cd->disk, rq, 0);
306 306 blk_put_request(rq);
307 /* 307 /*
308 * A reset will unlock the door. If it was previously locked, 308 * A reset will unlock the door. If it was previously locked,
309 * lock it again. 309 * lock it again.