diff options
| author | Jean Delvare <khali@linux-fr.org> | 2012-02-18 11:54:23 -0500 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2012-03-26 05:26:51 -0400 |
| commit | 30a7a8f897757abd8f7fbbf4aed70f61fbf8de2d (patch) | |
| tree | 287cb895de102a47d02c4efb995de19c436c43e8 | |
| parent | d4feccfe1abefeaee439be4968bc1ab469322bc9 (diff) | |
mfd: Fix ACPI conflict check
BugLink: http://bugs.launchpad.net/bugs/954576
commit 81b5482c32769abb6dfb979560dab2f952ba86fa upstream.
The code is currently always checking the first resource of every
device only (several times.) This has been broken since the ACPI check
was added in February 2010 in commit
91fedede0338eb6203cdd618d8ece873fdb7c22c.
Fix the check to run on each resource individually, once.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/mfd/mfd-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index 0902523af62..acf9dad686a 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c | |||
| @@ -122,7 +122,7 @@ static int mfd_add_device(struct device *parent, int id, | |||
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | if (!cell->ignore_resource_conflicts) { | 124 | if (!cell->ignore_resource_conflicts) { |
| 125 | ret = acpi_check_resource_conflict(res); | 125 | ret = acpi_check_resource_conflict(&res[r]); |
| 126 | if (ret) | 126 | if (ret) |
| 127 | goto fail_res; | 127 | goto fail_res; |
| 128 | } | 128 | } |