patch-2.4.7 linux/drivers/ide/ide-cd.c

• Lines: 63
• Date: Thu Jul 19 21:04:55 2001
• Orig file: v2.4.6/linux/drivers/ide/ide-cd.c
• Orig date: Fri May 25 12:44:11 2001

diff -u --recursive --new-file v2.4.6/linux/drivers/ide/ide-cd.c linux/drivers/ide/ide-cd.c
@@ -254,7 +254,7 @@
  *			  They will disappear later when I get the time to
  *			  do it cleanly.
  *			- Minimize the TOC reading - only do it when we
- *			  know a media change has occured.
+ *			  know a media change has occurred.
  *			- Moved all the CDROMREADx ioctls to the Uniform layer.
  *			- Heiko Eissfeldt <heiko@colossus.escape.de> supplied
  *			  some fixes for CDI.
@@ -307,6 +307,7 @@
 #include <linux/errno.h>
 #include <linux/cdrom.h>
 #include <linux/ide.h>
+#include <linux/completion.h>
 
 #include <asm/irq.h>
 #include <asm/io.h>
@@ -512,7 +513,7 @@
 }
 
 static void cdrom_queue_request_sense(ide_drive_t *drive, 
-				      struct semaphore *sem,
+				      struct completion *wait,
 				      struct request_sense *sense,
 				      struct packet_command *failed_command)
 {
@@ -534,7 +535,7 @@
 	ide_init_drive_cmd(rq);
 	rq->cmd = REQUEST_SENSE_COMMAND;
 	rq->buffer = (char *) pc;
-	rq->sem = sem;
+	rq->waiting = wait;
 	(void) ide_do_drive_cmd(drive, rq, ide_preempt);
 }
 
@@ -596,7 +597,7 @@
 
 	} else if (rq->cmd == PACKET_COMMAND) {
 		/* All other functions, except for READ. */
-		struct semaphore *sem = NULL;
+		struct completion *wait = NULL;
 		pc = (struct packet_command *) rq->buffer;
 
 		/* Check for tray open. */
@@ -622,15 +623,15 @@
 		   command request to the request sense request. */
 
 		if ((stat & ERR_STAT) != 0) {
-			sem = rq->sem;
-			rq->sem = NULL;
+			wait = rq->waiting;
+			rq->waiting = NULL;
 		}
 
 		pc->stat = 1;
 		cdrom_end_request (1, drive);
 
 		if ((stat & ERR_STAT) != 0)
-			cdrom_queue_request_sense(drive, sem, pc->sense, pc);
+			cdrom_queue_request_sense(drive, wait, pc->sense, pc);
 	} else {
 		/* Handle errors from READ and WRITE requests. */