From 1bd3becd03b7378b3d3f1bdec30adcae85b414e8 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sat, 18 Feb 2012 17:54:23 +0100
Subject: [PATCH] --- yaml --- r: 288167 b: refs/heads/master c:
 81b5482c32769abb6dfb979560dab2f952ba86fa h: refs/heads/master i:   288165:
 f8b3174265e00ac5aa916203376c92fb757653c0   288163:
 f4ba0f00dc382a1717ecad66d78bfa75a2592b15   288159:
 599e6756529b120eb0693a0d1a8de2253965abea v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mfd/mfd-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
 		}