1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 1823a57b7d8f..d1c8605d4ed4 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -65,9 +65,11 @@ static int mfd_add_device(struct device *parent, int id,
                         res[r].end   = cell->resources[r].end;
                 }
 
-                ret = acpi_check_resource_conflict(res);
-                if (ret)
-                        goto fail_res;
+                if (!cell->ignore_resource_conflicts) {
+                        ret = acpi_check_resource_conflict(res);
+                        if (ret)
+                                goto fail_res;
+                }
         }
 
         ret = platform_device_add_resources(pdev, res, cell->num_resources);