Skip to content

Commit

Permalink
Merge branch 'acpi-apei'
Browse files Browse the repository at this point in the history
* acpi-apei:
  ACPI / APEI: clear error status before acknowledging the error
  • Loading branch information
Rafael J. Wysocki committed Sep 28, 2017
2 parents e19b205 + aaf2c2f commit 333d177
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions drivers/acpi/apei/ghes.c
Original file line number Diff line number Diff line change
Expand Up @@ -743,17 +743,19 @@ static int ghes_proc(struct ghes *ghes)
}
ghes_do_proc(ghes, ghes->estatus);

out:
ghes_clear_estatus(ghes);

if (rc == -ENOENT)
return rc;

/*
* GHESv2 type HEST entries introduce support for error acknowledgment,
* so only acknowledge the error if this support is present.
*/
if (is_hest_type_generic_v2(ghes)) {
rc = ghes_ack_error(ghes->generic_v2);
if (rc)
return rc;
}
out:
ghes_clear_estatus(ghes);
if (is_hest_type_generic_v2(ghes))
return ghes_ack_error(ghes->generic_v2);

return rc;
}

Expand Down

0 comments on commit 333d177

Please sign in to comment.