Merge commit 'kumar/merge' into merge

[~andy/linux] / drivers / mfd / mfd-core.c

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 8ffbb7a85a7e67091105408f643e170f58bdcb1d..7dd76bceaae812ea439d69390dce8f71ca565ef7 100644 (file)
--- a/drivers/mfd/mfd-core.c
+++ b/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;