summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-01 23:09:27 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-01 23:09:27 +0100
commit37782fcefcca437f870e581e6cc316111f8b7660 (patch)
treec80d23c525fa758218e35d91dfff65f18e49764e
parent21ea1f0f011a5bbfbc3f5c134a4e537e5f5c1c50 (diff)
downloadblackbird-op-linux-37782fcefcca437f870e581e6cc316111f8b7660.tar.gz
blackbird-op-linux-37782fcefcca437f870e581e6cc316111f8b7660.zip
ide-cd: unify moving to the next buffer in cdrom_rw_intr()
Use the fact that for the first loop rq->current_nr_sectors is always set and unify moving to the next buffer for read/write requests. There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide-cd.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 4b395e015e76..0f17117c5aa0 100644
--- a/drivers/ide/ide-cd.c
+++ b/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);
}
OpenPOWER on IntegriCloud