diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-02 15:34:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-02 15:34:03 -0500 |
| commit | 115e8e705e4be071b9e06ff72578e3b603f2ba65 (patch) | |
| tree | 8ef96f62ed5239442cd55ad54ea5c97b0441e613 | |
| parent | 733bbb7e1c3acb8fabc55595bf1df8973dde7736 (diff) | |
| parent | f88e1ae8acb8affac29034ed79d4fff95ac8c29d (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index cbd5d701c7e0..63b3ec48c203 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 | |||
| 314 | if (!lookup) | 314 | if (!lookup) |
| 315 | return NULL; | 315 | return NULL; |
| 316 | 316 | ||
| 317 | for(; lookup->name != NULL; lookup++) { | 317 | for(; lookup->compatible != NULL; lookup++) { |
| 318 | if (!of_device_is_compatible(np, lookup->compatible)) | 318 | if (!of_device_is_compatible(np, lookup->compatible)) |
| 319 | continue; | 319 | continue; |
| 320 | if (of_address_to_resource(np, 0, &res)) | 320 | if (of_address_to_resource(np, 0, &res)) |