aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-04-18 18:00:42 -0400
committerTejun Heo <tj@kernel.org>2009-04-18 18:00:42 -0400
commitcbfd082abfcbed8c57a12636f36e9bead8d6cfc6 (patch)
tree4d4f19d63bc8af9ae48158cf729ad99147e8cf05 /drivers/ide
parentc267cc1c4db4ccb3406d045a8da8660f0bbfe08d (diff)
ide-cd: don't abuse rq->buffer
Impact: rq->buffer usage cleanup ide-cd uses rq->buffer to carry pointer to the original request when issuing REQUEST_SENSE. Use rq->special instead. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-cd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 509f1293cae2..eb3c299d95de 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -232,8 +232,8 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense,
232 rq->cmd_type = REQ_TYPE_SENSE; 232 rq->cmd_type = REQ_TYPE_SENSE;
233 rq->cmd_flags |= REQ_PREEMPT; 233 rq->cmd_flags |= REQ_PREEMPT;
234 234
235 /* NOTE! Save the failed command in "rq->buffer" */ 235 /* NOTE! Save the failed command in "rq->special" */
236 rq->buffer = (void *) failed_command; 236 rq->special = (void *)failed_command;
237 237
238 if (failed_command) 238 if (failed_command)
239 ide_debug_log(IDE_DBG_SENSE, "failed_cmd: 0x%x", 239 ide_debug_log(IDE_DBG_SENSE, "failed_cmd: 0x%x",
@@ -247,10 +247,10 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense,
247static void ide_cd_complete_failed_rq(ide_drive_t *drive, struct request *rq) 247static void ide_cd_complete_failed_rq(ide_drive_t *drive, struct request *rq)
248{ 248{
249 /* 249 /*
250 * For REQ_TYPE_SENSE, "rq->buffer" points to the original 250 * For REQ_TYPE_SENSE, "rq->special" points to the original
251 * failed request 251 * failed request
252 */ 252 */
253 struct request *failed = (struct request *)rq->buffer; 253 struct request *failed = (struct request *)rq->special;
254 struct cdrom_info *info = drive->driver_data; 254 struct cdrom_info *info = drive->driver_data;
255 void *sense = &info->sense_data; 255 void *sense = &info->sense_data;
256 256