summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-02 12:34:03 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-02 12:34:03 -0800
commit115e8e705e4be071b9e06ff72578e3b603f2ba65 (patch)
tree8ef96f62ed5239442cd55ad54ea5c97b0441e613
parent733bbb7e1c3acb8fabc55595bf1df8973dde7736 (diff)
parentf88e1ae8acb8affac29034ed79d4fff95ac8c29d (diff)
downloadlinux-3.10-115e8e705e4be071b9e06ff72578e3b603f2ba65.tar.gz
linux-3.10-115e8e705e4be071b9e06ff72578e3b603f2ba65.tar.bz2
linux-3.10-115e8e705e4be071b9e06ff72578e3b603f2ba65.zip
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: dt/device: Fix auxdata matching to handle entries without a name override
-rw-r--r--drivers/of/platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index cbd5d701c7e..63b3ec48c20 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -314,7 +314,7 @@ static const struct of_dev_auxdata *of_dev_lookup(const struct of_dev_auxdata *l
if (!lookup)
return NULL;
- for(; lookup->name != NULL; lookup++) {
+ for(; lookup->compatible != NULL; lookup++) {
if (!of_device_is_compatible(np, lookup->compatible))
continue;
if (of_address_to_resource(np, 0, &res))