patch-1.3.28 linux/drivers/block/sonycd535.c

• Lines: 23
• Date: Mon Sep 18 08:54:08 1995
• Orig file: v1.3.27/linux/drivers/block/sonycd535.c
• Orig date: Sat Sep 9 15:26:51 1995

diff -u --recursive --new-file v1.3.27/linux/drivers/block/sonycd535.c linux/drivers/block/sonycd535.c
@@ -286,7 +286,7 @@
  * check or 0 if it hasn't.  Setting flag to 0 resets the changed flag.
  */
 static int
-cdu535_check_media_change(dev_t full_dev)
+cdu535_check_media_change(kdev_t full_dev)
 {
 	int retval;
 
@@ -832,11 +832,11 @@
 		 * The beginning here is stolen from the hard disk driver.  I hope
 		 * it's right.
 		 */
-		if (!(CURRENT) || CURRENT->dev < 0) {
+		if (!(CURRENT) || CURRENT->rq_status == RQ_INACTIVE) {
 			return;
 		}
 		INIT_REQUEST;
-		dev = MINOR(CURRENT->dev);
+		dev = MINOR(CURRENT->rq_dev);
 		block = CURRENT->sector;
 		nsect = CURRENT->nr_sectors;
 		if (dev != 0) {