From 870edb3b785e4fbfba01de60522b7ad2b3280ea6 Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Sun, 9 Mar 2008 11:57:56 -0500
Subject: [PATCH] --- yaml --- r: 87132 b: refs/heads/master c:
 e88a0c2ca81207a75afe5bbb8020541dabf606ac h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/base/platform.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6c9649d1e408..d4136bb9c571 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbab976d7ce4556d4212d554f766dae461d22e16
+refs/heads/master: e88a0c2ca81207a75afe5bbb8020541dabf606ac
diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c
index efaf282c438c..911ec600fe71 100644
--- a/trunk/drivers/base/platform.c
+++ b/trunk/drivers/base/platform.c
@@ -648,7 +648,7 @@ u64 dma_get_required_mask(struct device *dev)
 		high_totalram += high_totalram - 1;
 		mask = (((u64)high_totalram) << 32) + 0xffffffff;
 	}
-	return mask & *dev->dma_mask;
+	return mask;
 }
 EXPORT_SYMBOL_GPL(dma_get_required_mask);
 #endif