diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/cdrom/cdu31a.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
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) | |||
| 1402 | if (!end_that_request_first(req, 1, nblock)) { | 1402 | if (!end_that_request_first(req, 1, nblock)) { |
| 1403 | spin_lock_irq(q->queue_lock); | 1403 | spin_lock_irq(q->queue_lock); |
| 1404 | blkdev_dequeue_request(req); | 1404 | blkdev_dequeue_request(req); |
| 1405 | end_that_request_last(req); | 1405 | end_that_request_last(req, 1); |
| 1406 | spin_unlock_irq(q->queue_lock); | 1406 | spin_unlock_irq(q->queue_lock); |
| 1407 | } | 1407 | } |
| 1408 | continue; | 1408 | continue; |