From 6e8af1d1974dd6798d4113dfcccf929ddde429c7 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Tue, 27 Jan 2009 17:42:28 +0100 Subject: [PATCH] --- yaml --- r: 137633 b: refs/heads/master c: 3f2154d7e701a8a4791de95765314219caa533a2 h: refs/heads/master i: 137631: 633dfa8303cc9f0f6a041177974df3f8729674be v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-cd.c | 2 +- trunk/drivers/ide/ide-cd.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b108f5efa539..fa29ed5b981e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13b8860d102de3daa4a4bf23542495b507edd7e9 +refs/heads/master: 3f2154d7e701a8a4791de95765314219caa533a2 diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c index d163e6571e09..4528e25f2bbb 100644 --- a/trunk/drivers/ide/ide-cd.c +++ b/trunk/drivers/ide/ide-cd.c @@ -213,7 +213,7 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense, struct request *failed_command) { struct cdrom_info *info = drive->driver_data; - struct request *rq = &info->request_sense_request; + struct request *rq = &drive->request_sense_rq; ide_debug_log(IDE_DBG_SENSE, "enter"); diff --git a/trunk/drivers/ide/ide-cd.h b/trunk/drivers/ide/ide-cd.h index 3b77dd735088..1d97101099ce 100644 --- a/trunk/drivers/ide/ide-cd.h +++ b/trunk/drivers/ide/ide-cd.h @@ -91,8 +91,6 @@ struct cdrom_info { on this device. */ struct request_sense sense_data; - struct request request_sense_request; - u8 max_speed; /* Max speed of the drive. */ u8 current_speed; /* Current speed of the drive. */