projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pci-v4.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
[cascardo/linux.git]
/
drivers
/
acpi
/
apei
/
apei-base.c
diff --git
a/drivers/acpi/apei/apei-base.c
b/drivers/acpi/apei/apei-base.c
index
a2c8d7a
..
da370e1
100644
(file)
--- a/
drivers/acpi/apei/apei-base.c
+++ b/
drivers/acpi/apei/apei-base.c
@@
-536,7
+536,8
@@
int apei_resources_request(struct apei_resources *resources,
goto err_unmap_ioport;
}
goto err_unmap_ioport;
}
- return 0;
+ goto arch_res_fini;
+
err_unmap_ioport:
list_for_each_entry(res, &resources->ioport, list) {
if (res == res_bak)
err_unmap_ioport:
list_for_each_entry(res, &resources->ioport, list) {
if (res == res_bak)
@@
-551,7
+552,8
@@
err_unmap_iomem:
release_mem_region(res->start, res->end - res->start);
}
arch_res_fini:
release_mem_region(res->start, res->end - res->start);
}
arch_res_fini:
- apei_resources_fini(&arch_res);
+ if (arch_apei_filter_addr)
+ apei_resources_fini(&arch_res);
nvs_res_fini:
apei_resources_fini(&nvs_resources);
return rc;
nvs_res_fini:
apei_resources_fini(&nvs_resources);
return rc;