Commit 855cc454 authored Feb 18, 2012 by Jean Delvare Committed by Samuel Ortiz Mar 06, 2012

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
91fedede.

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>

parent ee42b3aa

drivers/mfd/mfd-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message