Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block

Manual fixup for merge with Jens' "Suspend support for libata", commit
ID 9b847548663ef1039dd49f0eb4463d001e596bc3.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 70aeb3a60120..d31117eb95aa 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -614,7 +614,7 @@ static void cdrom_end_request (ide_drive_t *drive, int uptodate)
                          */
                         spin_lock_irqsave(&ide_lock, flags);
                         end_that_request_chunk(failed, 0, failed->data_len);
-                        end_that_request_last(failed);
+                        end_that_request_last(failed, 0);
                         spin_unlock_irqrestore(&ide_lock, flags);
                 }
 
@@ -1735,7 +1735,7 @@ end_request:
 
         spin_lock_irqsave(&ide_lock, flags);
         blkdev_dequeue_request(rq);
-        end_that_request_last(rq);
+        end_that_request_last(rq, 1);
         HWGROUP(drive)->rq = NULL;
         spin_unlock_irqrestore(&ide_lock, flags);
         return ide_stopped;