aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-cd.c
diff options
context:
space:
mode:
authorBorislav Petkov <petkovbb@googlemail.com>2009-02-02 20:12:21 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-02-02 20:12:21 +0100
commit9e772d0135a5b5f8355320be429efa339700d52d (patch)
tree4c707a5a8b08d81fc62c29fd224b9901d79645a4 /drivers/ide/ide-cd.c
parentManually revert "mlock: downgrade mmap sem while populating mlocked regions" (diff)
downloadlinux-dev-9e772d0135a5b5f8355320be429efa339700d52d.tar.xz
linux-dev-9e772d0135a5b5f8355320be429efa339700d52d.zip
ide-cd: fix DMA for non bio-backed requests
This one fixes http://bugzilla.kernel.org/show_bug.cgi?id=12320. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r--drivers/ide/ide-cd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index cae69372cf45..0bfeb0c79d6e 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -787,6 +787,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
if (blk_fs_request(rq)) {
ide_end_request(drive, 1, rq->nr_sectors);
return ide_stopped;
+ } else if (rq->cmd_type == REQ_TYPE_ATA_PC && !rq->bio) {
+ ide_end_request(drive, 1, 1);
+ return ide_stopped;
}
goto end_request;
}