diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2010-03-25 20:09:04 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-05-27 19:37:31 -0400 |
commit | f03cfcbc843ae6854c69dbc771762b83b3bea15f (patch) | |
tree | d65ef52e0a23ebeb6875738695cf7b0196735f09 | |
parent | 5f7df57eeca93fc931b32e7723fe8f964aaa63df (diff) |
mfd: Check for mem_base when building IORESOURCE_MEM resources
If mem_base is NULL, then we fall back to the default case, just copying the
original resource.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r-- | drivers/mfd/mfd-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index 8ffbb7a85a7e..7dd76bceaae8 100644 --- 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, | |||
48 | res[r].flags = cell->resources[r].flags; | 48 | res[r].flags = cell->resources[r].flags; |
49 | 49 | ||
50 | /* Find out base to use */ | 50 | /* Find out base to use */ |
51 | if (cell->resources[r].flags & IORESOURCE_MEM) { | 51 | if ((cell->resources[r].flags & IORESOURCE_MEM) && mem_base) { |
52 | res[r].parent = mem_base; | 52 | res[r].parent = mem_base; |
53 | res[r].start = mem_base->start + | 53 | res[r].start = mem_base->start + |
54 | cell->resources[r].start; | 54 | cell->resources[r].start; |