summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-27 07:36:17 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-27 07:36:17 -0700
commit5d9e4ea55ae19f9083b9c2c97cc912b823ee7ab4 (patch)
tree1ffe2c5546d3891f72f4235a788240a520a2db02 /drivers/ide
parentd68b8622ccbee8a18e495ad1650c3306f2eeb0d6 (diff)
downloadop-kernel-dev-5d9e4ea55ae19f9083b9c2c97cc912b823ee7ab4.zip
op-kernel-dev-5d9e4ea55ae19f9083b9c2c97cc912b823ee7ab4.tar.gz
ide-cd: revert DMA mask test change
The change to require the DMA length to be only word-aligned was not safe.
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-cd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index f0bd242..78e3e7b 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1932,8 +1932,11 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
/*
* check if dma is safe
+ *
+ * NOTE! The "len" and "addr" checks should possibly have
+ * separate masks.
*/
- if ((rq->data_len & 3) || (addr & mask))
+ if ((rq->data_len & mask) || (addr & mask))
info->dma = 0;
}
OpenPOWER on IntegriCloud