diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 23:33:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 23:33:22 +0200 |
| commit | a89e14edd296f1772bb93b7165cb03f29d11e4b3 (patch) | |
| tree | cb639b9fbdc85d314facf765afde2be0da34aade /drivers/of/platform.c | |
| parent | 5d74c8a065abc8ae283a6fe8a1e7dd6313a22165 (diff) | |
| parent | 2b667a2d8005e7c8362a77365cedbcd71fa5d6c1 (diff) | |
Merge branch 'ux500/fixes-3.5' into next/dt
prerequisite for ux500/dt branch
Diffstat (limited to 'drivers/of/platform.c')
| -rw-r--r-- | drivers/of/platform.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 3132ea068d95..e44f8c2d239d 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -317,10 +317,9 @@ static const struct of_dev_auxdata *of_dev_lookup(const struct of_dev_auxdata *l for(; lookup->compatible != NULL; lookup++) { if (!of_device_is_compatible(np, lookup->compatible)) continue; - if (of_address_to_resource(np, 0, &res)) - continue; - if (res.start != lookup->phys_addr) - continue; + if (!of_address_to_resource(np, 0, &res)) + if (res.start != lookup->phys_addr) + continue; pr_debug("%s: devname=%s\n", np->full_name, lookup->name); return lookup; } |