From 9fca94489d755fa21587b5ed00e375f63a3d56c2 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Fri, 26 Mar 2010 01:09:04 +0100
Subject: [PATCH] --- yaml --- r: 199379 b: refs/heads/master c:
 f03cfcbc843ae6854c69dbc771762b83b3bea15f h: refs/heads/master i:   199377:
 cf21ff57be90d21ffde7eb5ea787125f921441f7   199375:
 d583575371440519e7c46de966f3507e2cbee294 v: v3

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

diff --git a/[refs] b/[refs]
index 9f347ec344a7..d04e65b4cdc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f7df57eeca93fc931b32e7723fe8f964aaa63df
+refs/heads/master: f03cfcbc843ae6854c69dbc771762b83b3bea15f
diff --git a/trunk/drivers/mfd/mfd-core.c b/trunk/drivers/mfd/mfd-core.c
index 8ffbb7a85a7e..7dd76bceaae8 100644
--- a/trunk/drivers/mfd/mfd-core.c
+++ b/trunk/drivers/mfd/mfd-core.c
@@ -48,7 +48,7 @@ static int mfd_add_device(struct device *parent, int id,
 		res[r].flags = cell->resources[r].flags;
 
 		/* Find out base to use */
-		if (cell->resources[r].flags & IORESOURCE_MEM) {
+		if ((cell->resources[r].flags & IORESOURCE_MEM) && mem_base) {
 			res[r].parent = mem_base;
 			res[r].start = mem_base->start +
 				cell->resources[r].start;