---

yaml --- r: 82119 b: refs/heads/master c: 37782fc h: refs/heads/master i: 82117: ea84043 82115: 3a9ef59 82111: b374946 v: v3
git-mirror · Feb 1, 2008 · f8bbe9a · f8bbe9a
1 parent 30837ff
commit f8bbe9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21ea1f0f011a5bbfbc3f5c134a4e537e5f5c1c50
+refs/heads/master: 37782fcefcca437f870e581e6cc316111f8b7660
diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c
@@ -1302,13 +1302,6 @@ static ide_startstop_t cdrom_rw_intr(ide_drive_t *drive)
 	while (sectors_to_transfer > 0) {
 		int this_transfer;
 
-		/*
-		 * If we've filled the present buffer but there's another
-		 * chained buffer after it, move on.
-		 */
-		if (!write && rq->current_nr_sectors == 0 && rq->nr_sectors)
-			cdrom_end_request(drive, 1);
-
 		if (!rq->current_nr_sectors) {
 			if (!write)
 				/*
@@ -1342,7 +1335,7 @@ static ide_startstop_t cdrom_rw_intr(ide_drive_t *drive)
 		/*
 		 * current buffer complete, move on
 		 */
-		if (write && rq->current_nr_sectors == 0 && rq->nr_sectors)
+		if (rq->current_nr_sectors == 0 && rq->nr_sectors)
 			cdrom_end_request(drive, 1);
 	}