diff options
| author | Irina Tirdea <irina.tirdea@intel.com> | 2016-03-13 03:02:58 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-04-11 13:31:40 +0100 |
| commit | ee414de525a9abf29e8a1b0c1b6f79f9e875213a (patch) | |
| tree | eaaf0ac0265e516cf0a7b2a87808d2c33be81659 /drivers/mfd/mfd-core.c | |
| parent | 9caac886397bdfd6c1a6b48493db6cd95bce313c (diff) | |
| download | linux-stable-ee414de525a9abf29e8a1b0c1b6f79f9e875213a.tar.gz linux-stable-ee414de525a9abf29e8a1b0c1b6f79f9e875213a.tar.bz2 linux-stable-ee414de525a9abf29e8a1b0c1b6f79f9e875213a.zip | |
mfd: core: Fix ACPI child matching by _HID/_CID
If MDF child devices have separate ACPI nodes identified
by _HID/_CID, they will not be assigned the intended
ACPI companion.
acpi_match_device_ids will return 0 if a the child device
matches the _HID/_CID, so this patch changes the matching
condition to check for 0 on success.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Acked-by: Mika Westerberg <mika.westeberg@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/mfd-core.c')
| -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 88bd1b1e47be..409da01effcd 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c @@ -107,7 +107,7 @@ static void mfd_acpi_add_device(const struct mfd_cell *cell, strlcpy(ids[0].id, match->pnpid, sizeof(ids[0].id)); list_for_each_entry(child, &parent->children, node) { - if (acpi_match_device_ids(child, ids)) { + if (!acpi_match_device_ids(child, ids)) { adev = child; break; } |