summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/mfd-core.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2012-02-18 17:54:23 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2012-03-06 18:46:47 +0100
commit855cc454341c6ca1212bf86939f2f2a51ab54e18 (patch)
treebc3dc831e0aa2f00c9a6806c796d270b8c3dfd5b /drivers/mfd/mfd-core.c
parentee42b3aa3791263a6cca36856b306cd1ae897ebf (diff)
downloadlinux-855cc454341c6ca1212bf86939f2f2a51ab54e18.tar.gz
linux-855cc454341c6ca1212bf86939f2f2a51ab54e18.tar.bz2
linux-855cc454341c6ca1212bf86939f2f2a51ab54e18.zip
mfd: Fix ACPI conflict check
The code is currently always checking the first resource of every device only (several times.) This has been broken since the ACPI check was added in February 2010 in commit 91fedede0338eb6203cdd618d8ece873fdb7c22c. Fix the check to run on each resource individually, once. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: stable@vger.kernel.org Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/mfd-core.c')
-rw-r--r--drivers/mfd/mfd-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 9fc05b9b0bab..ffc3d48676ae 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -123,7 +123,7 @@ static int mfd_add_device(struct device *parent, int id,
}
if (!cell->ignore_resource_conflicts) {
- ret = acpi_check_resource_conflict(res);
+ ret = acpi_check_resource_conflict(&res[r]);
if (ret)
goto fail_res;
}