From a7c242d73d6cb9af024011ff00c82b2f21d65d89 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Fri, 10 Jun 2011 02:22:06 -0500
Subject: [PATCH] --- yaml --- r: 259151 b: refs/heads/master c:
 6471fc6630a507fd54fdaceceee1ddaf3c917cde h: refs/heads/master i:   259149:
 9dfdda052f015f703b49e15574abe895993037f3   259147:
 35ddf0a2a98f8894affd69db17316abda45fdf22   259143:
 b5b2984e464e084a0a839ce819b7866c23e27a99   259135:
 69912c55831a09c8e7adf1a6731778aef922924a v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/kernel/dma.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 31c3767bf942..89e32a7258ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 314b02f503c2c219fde0fcf6f086fda415f8a847
+refs/heads/master: 6471fc6630a507fd54fdaceceee1ddaf3c917cde
diff --git a/trunk/arch/powerpc/kernel/dma.c b/trunk/arch/powerpc/kernel/dma.c
index d238c082c3c5..4f0959fbfbee 100644
--- a/trunk/arch/powerpc/kernel/dma.c
+++ b/trunk/arch/powerpc/kernel/dma.c
@@ -161,9 +161,7 @@ int dma_set_mask(struct device *dev, u64 dma_mask)
 
 	if (ppc_md.dma_set_mask)
 		return ppc_md.dma_set_mask(dev, dma_mask);
-	if (unlikely(dma_ops == NULL))
-		return -EIO;
-	if (dma_ops->set_dma_mask != NULL)
+	if ((dma_ops != NULL) && (dma_ops->set_dma_mask != NULL))
 		return dma_ops->set_dma_mask(dev, dma_mask);
 	if (!dev->dma_mask || !dma_supported(dev, dma_mask))
 		return -EIO;