Skip to content

Commit

Permalink
mfd: Fix ACPI conflict check
Browse files Browse the repository at this point in the history
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
91feded.

Fix the check to run on each resource individually, once.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: stable@vger.kernel.org
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Jean Delvare authored and Samuel Ortiz committed Feb 23, 2012
1 parent a60e8df commit 81b5482
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/mfd/mfd-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 81b5482

Please sign in to comment.