---

yaml --- r: 137633 b: refs/heads/master c: 3f2154d h: refs/heads/master i: 137631: 633dfa8 v: v3
git-mirror · Mar 27, 2009 · 6e8af1d · 6e8af1d
1 parent ac1fafc
commit 6e8af1d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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. */