diff --git a/[refs] b/[refs]
index 1826344dafb8..10a481fa9959 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a60e8df64ddc6bd79c85a970f59f2967c968cfac
+refs/heads/master: 81b5482c32769abb6dfb979560dab2f952ba86fa
diff --git a/trunk/drivers/mfd/mfd-core.c b/trunk/drivers/mfd/mfd-core.c
index 0f5922812bff..411f523d4878 100644
--- a/trunk/drivers/mfd/mfd-core.c
+++ b/trunk/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;
 		}