From 5107b05e3bd480a394ef64b6edb66eb7a09a37c7 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Fri, 27 May 2005 07:36:17 -0700
Subject: [PATCH] --- yaml --- r: 1457 b: refs/heads/master c:
 5d9e4ea55ae19f9083b9c2c97cc912b823ee7ab4 h: refs/heads/master i:   1455:
 b9b39ecaf12f11bc57a1c5aadbc6ad9dfff5eddd v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/ide/ide-cd.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ff859ba4c08a..9d686eb2a29a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d68b8622ccbee8a18e495ad1650c3306f2eeb0d6
+refs/heads/master: 5d9e4ea55ae19f9083b9c2c97cc912b823ee7ab4
diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c
index f0bd242e030f..78e3e7b24d7d 100644
--- a/trunk/drivers/ide/ide-cd.c
+++ b/trunk/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;
 	}