From beb585cdde7c22b3f44ec7f50bf06b1272f49c0e Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Fri, 19 Feb 2010 11:07:59 +0100
Subject: [PATCH] --- yaml --- r: 186914 b: refs/heads/master c:
 91fedede0338eb6203cdd618d8ece873fdb7c22c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d5c2116685f6..fdf45d7b5d68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14e5c82ca32870698b7cbe54196e00682d929ca5
+refs/heads/master: 91fedede0338eb6203cdd618d8ece873fdb7c22c
diff --git a/trunk/drivers/mfd/mfd-core.c b/trunk/drivers/mfd/mfd-core.c
index ae15e495e20e..aa17f4bddc56 100644
--- a/trunk/drivers/mfd/mfd-core.c
+++ b/trunk/drivers/mfd/mfd-core.c
@@ -13,6 +13,7 @@
 
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
+#include <linux/acpi.h>
 #include <linux/mfd/core.h>
 
 static int mfd_add_device(struct device *parent, int id,
@@ -62,6 +63,10 @@ static int mfd_add_device(struct device *parent, int id,
 			res[r].start = cell->resources[r].start;
 			res[r].end   = cell->resources[r].end;
 		}
+
+		ret = acpi_check_resource_conflict(res);
+		if (ret)
+			goto fail_res;
 	}
 
 	platform_device_add_resources(pdev, res, cell->num_resources);