diff options
| author | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2015-05-01 10:41:10 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2015-06-22 12:25:17 +0100 |
| commit | ec40c606c7aebb8d61cb47af27e2f62c26e09e29 (patch) | |
| tree | ecd1c5d08f2ee8a83a757131d29832781516613f /drivers/mfd | |
| parent | b64610dfbdf6a21e92073d50fef33704dbfe6028 (diff) | |
| download | linux-stable-ec40c606c7aebb8d61cb47af27e2f62c26e09e29.tar.gz linux-stable-ec40c606c7aebb8d61cb47af27e2f62c26e09e29.tar.bz2 linux-stable-ec40c606c7aebb8d61cb47af27e2f62c26e09e29.zip | |
mfd: Check ACPI device companion before checking resources
Current code in mfd-core calls into ACPI to check resources even
on a system that booted with a DT (on kernels with both DT and ACPI
support compiled in). This triggers ACPI exceptions since we may
end up calling the ACPI interpreter when it has not been initialized:
"ACPI Exception: AE_BAD_PARAMETER, Thread 2064154624 could not acquire
Mutex [0x1] (20150410/utmutex-285)"
This patch fixes the issues by adding a check for an ACPI companion
device before carrying out ACPI resources checks to avoid calling
the ACPI interpreter if the fwnode representing the device is an OF one.
Cc: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/mfd-core.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index 1aed3b7b8d9b..14fd5cbcf0f2 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c @@ -207,9 +207,11 @@ static int mfd_add_device(struct device *parent, int id, } if (!cell->ignore_resource_conflicts) { - ret = acpi_check_resource_conflict(&res[r]); - if (ret) - goto fail_alias; + if (has_acpi_companion(&pdev->dev)) { + ret = acpi_check_resource_conflict(&res[r]); + if (ret) + goto fail_alias; + } } } |