From: Jens Axboe <axboe@suse.de>
Date: Tue, 31 May 2005 15:47:36 +0000 (+0200)
Subject: [PATCH] Relax idecd dma alignment check
X-Git-Tag: v2.6.12-rc6~77
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4e7c6816d680d1945916db047a47847afe4b9b02;p=~emulex%2Finfiniband.git

[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>
---

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 78e3e7b24d7..39f3e9101ed 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;
 	}