From f8bbe9a21b4ce17d7eb5e4dfbe7176c137697e6d Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 1 Feb 2008 23:09:27 +0100 Subject: [PATCH] --- yaml --- r: 82119 b: refs/heads/master c: 37782fcefcca437f870e581e6cc316111f8b7660 h: refs/heads/master i: 82117: ea84043a9d6017f304ad55f821726b2488385ac8 82115: 3a9ef595ff1298cc80ff05b29cfdc2fd51d97f91 82111: b374946217e11daf205518e46d45bc2a18c35406 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-cd.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index d14f7579dcd4..1f4e1dcfb70d 100644 --- 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 index 4b395e015e76..0f17117c5aa0 100644 --- 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); }