diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-19 20:17:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-19 20:17:30 +0200 |
| commit | abaa72d7fd9a20a67b62e6afa0e746e27851dc33 (patch) | |
| tree | ebe4134fcc93a6e205e6004b3e652d7a62281651 /drivers/of | |
| parent | net-tcp: Fast Open client - cookie-less mode (diff) | |
| parent | Merge tag 'md-3.5-fixes' of git://neil.brown.name/md (diff) | |
| download | linux-abaa72d7fd9a20a67b62e6afa0e746e27851dc33.tar.xz linux-abaa72d7fd9a20a67b62e6afa0e746e27851dc33.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/platform.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 343ad29e211c..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; } @@ -462,4 +461,5 @@ int of_platform_populate(struct device_node *root, of_node_put(root); return rc; } +EXPORT_SYMBOL_GPL(of_platform_populate); #endif /* CONFIG_OF_ADDRESS */ |