summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2005-05-31 17:47:36 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 09:11:57 -0700
commit4e7c6816d680d1945916db047a47847afe4b9b02 (patch)
treebf504678d31037e7946a9a33a7c47c1637d7818a
parent05fda3b1d88ebac1fc866fc3ed5b7ef5a4672fa6 (diff)
downloadop-kernel-dev-4e7c6816d680d1945916db047a47847afe4b9b02.zip
op-kernel-dev-4e7c6816d680d1945916db047a47847afe4b9b02.tar.gz
[PATCH] Relax idecd dma alignment check
Only the address needs alignment of mask bits, length should work with a relaxed alignment check. Signed-off-by: Jens Axboe <axboe@suse.de> [ This is take 2: make the length check be for 16-byte alignment, not just word alignment. That should hopefully keep everybody happy, while still allowing CD writing with DMA ] Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/ide/ide-cd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 78e3e7b..39f3e91 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1936,7 +1936,7 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
* NOTE! The "len" and "addr" checks should possibly have
* separate masks.
*/
- if ((rq->data_len & mask) || (addr & mask))
+ if ((rq->data_len & 15) || (addr & mask))
info->dma = 0;
}
OpenPOWER on IntegriCloud