Commit ec40c606 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Lee Jones

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: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent b64610df
...@@ -207,9 +207,11 @@ static int mfd_add_device(struct device *parent, int id, ...@@ -207,9 +207,11 @@ static int mfd_add_device(struct device *parent, int id,
} }
if (!cell->ignore_resource_conflicts) { if (!cell->ignore_resource_conflicts) {
ret = acpi_check_resource_conflict(&res[r]); if (has_acpi_companion(&pdev->dev)) {
if (ret) ret = acpi_check_resource_conflict(&res[r]);
goto fail_alias; if (ret)
goto fail_alias;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment