mfd: Fix ACPI conflict check

Jean Delvare · Samuel Ortiz · commit 855cc454341c · 2012-03-06T18:46:47.000+01:00
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 91feded. 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>
diff --git 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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ static int mfd_add_device(struct device *parent, int id,`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`if (!cell->ignore_resource_conflicts) {`
`126`		`- ret = acpi_check_resource_conflict(res);`
	`126`	`+ ret = acpi_check_resource_conflict(&res[r]);`
`127`	`127`	`if (ret)`
`128`	`128`	`goto fail_res;`
`129`	`129`	`}`