From 6131ea23d612e32eb4950034f955e00c8e540312 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: 296843 b: refs/heads/master c:
 855cc454341c6ca1212bf86939f2f2a51ab54e18 h: refs/heads/master i:   296841:
 813f54cb236ba1592914db22f1e39bde76e5f323   296839:
 12cffe1ba101f36b2de758aeb1b2241d2d6b61ce 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 495eda12e410..6a055baee925 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee42b3aa3791263a6cca36856b306cd1ae897ebf
+refs/heads/master: 855cc454341c6ca1212bf86939f2f2a51ab54e18
diff --git a/trunk/drivers/mfd/mfd-core.c b/trunk/drivers/mfd/mfd-core.c
index 9fc05b9b0bab..ffc3d48676ae 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;
 		}