leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: Check for ACPI conflicts

Browse Source 
For ACPI based systems, we should check for ACPI conflicts when adding the
platform devices. The test will always succeed for non ACPI platforms.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2010-02-19 11:07:59 +01:00
parent 14e5c82ca3
commit 91fedede03
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mfd/mfd-core.c
View File

@ -13,6 +13,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/acpi.h>
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
static int mfd_add_device(struct device *parent, int id, 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].start = cell->resources[r].start;
res[r].end = cell->resources[r].end; 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); platform_device_add_resources(pdev, res, cell->num_resources);