mirror of
https://github.com/torvalds/linux.git
synced 2026-06-10 07:32:29 +02:00
mfd: Fix ACPI conflict check
commit81b5482c32upstream. 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 commit91fedede03. 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>
This commit is contained in:
parent
4b77339222
commit
d7838b04ec
|
|
@ -122,7 +122,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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user