diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:01:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:01:25 +0100 |
| commit | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (patch) | |
| tree | 415aefe6d168df27c006fcc53b1ea5242eabaaea /drivers/cdrom/cdu31a.c | |
| parent | x86: remove bogus 'pci=usepirqmask' suggestion when no irq is defined (diff) | |
| parent | [SCSI] scsi_end_async() needs to take an uptodate parameter (diff) | |
| download | linux-d99cf9d679a520d67f81d805b7cb91c68e1847f0.tar.xz linux-d99cf9d679a520d67f81d805b7cb91c68e1847f0.zip | |
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>
Diffstat (limited to 'drivers/cdrom/cdu31a.c')
| -rw-r--r-- | drivers/cdrom/cdu31a.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c index ac96de15d833..378e88d20757 100644 --- a/drivers/cdrom/cdu31a.c +++ b/drivers/cdrom/cdu31a.c @@ -1402,7 +1402,7 @@ static void do_cdu31a_request(request_queue_t * q) if (!end_that_request_first(req, 1, nblock)) { spin_lock_irq(q->queue_lock); blkdev_dequeue_request(req); - end_that_request_last(req); + end_that_request_last(req, 1); spin_unlock_irq(q->queue_lock); } continue; |