Commit 81b5482c authored Feb 18, 2012 by Jean Delvare Committed by Samuel Ortiz Feb 23, 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 a60e8df6

drivers/mfd/mfd-core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -123,7 +123,7 @@ 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);		ret = acpi_check_resource_conflict(&res[r]);
	if (ret)		if (ret)
	goto fail_res;		goto fail_res;
	}		}