---

yaml --- r: 199379 b: refs/heads/master c: f03cfcb h: refs/heads/master i: 199377: cf21ff5 199375: d583575 v: v3
git-mirror · May 27, 2010 · 9fca944 · 9fca944
1 parent 413dbc0
commit 9fca944
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;