projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
826c416
)
nfit: Fix the check for a successful NFIT merge
author
Linda Knippers
<
[email protected]
>
Sat, 21 Nov 2015 00:05:48 +0000
(19:05 -0500)
committer
Dan Williams
<
[email protected]
>
Mon, 30 Nov 2015 22:51:46 +0000
(14:51 -0800)
Missed previously due to a lack of test coverage on a platform that
provided an valid response to _FIT.
Signed-off-by: Linda Knippers <
[email protected]
>
Acked-by: Vishal Verma <
[email protected]
>
Signed-off-by: Dan Williams <
[email protected]
>
drivers/acpi/nfit.c
patch
|
blob
|
history
diff --git
a/drivers/acpi/nfit.c
b/drivers/acpi/nfit.c
index 4d5ab285de943834f395f10854a372ed15014f9f..f92adb5b0fef093adad7f07cad32241dc786616a 100644
(file)
--- a/
drivers/acpi/nfit.c
+++ b/
drivers/acpi/nfit.c
@@
-1816,7
+1816,7
@@
static void acpi_nfit_notify(struct acpi_device *adev, u32 event)
nfit_saved = acpi_desc->nfit;
acpi_desc->nfit = (struct acpi_table_nfit *)buf.pointer;
ret = acpi_nfit_init(acpi_desc, buf.length);
- if (
!
ret) {
+ if (ret) {
/* Merge failed, restore old nfit, and exit */
acpi_desc->nfit = nfit_saved;
dev_err(dev, "failed to merge updated NFIT\n");