From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Fri, 27 May 2005 14:36:17 +0000 (-0700)
Subject: ide-cd: revert DMA mask test change
X-Git-Tag: v2.6.12-rc6~142
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=5d9e4ea55ae19f9083b9c2c97cc912b823ee7ab4;p=cascardo%2Flinux.git

ide-cd: revert DMA mask test change

The change to require the DMA length to be only word-aligned was not
safe.
---

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