Skip to content

Commit

Permalink
platform/x86: toshiba_haps: Split ACPI and HDD protection error handling
Browse files Browse the repository at this point in the history
Currently the code checking for the ACPI status is mixed along with
the actual HDD protection status check.

This patch splits those two checks as they are not related, printing
an error string in case the ACPI call failed, and then check for
actual HDD protection status.

Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
  • Loading branch information
Azael Avalos authored and Darren Hart committed Sep 23, 2016
1 parent 6f7e357 commit 5545544
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/platform/x86/toshiba_haps.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,13 @@ static int toshiba_haps_available(acpi_handle handle)
* A non existent device as well as having (only)
* Solid State Drives can cause the call to fail.
*/
status = acpi_evaluate_integer(handle, "_STA", NULL,
&hdd_present);
if (ACPI_FAILURE(status) || !hdd_present) {
status = acpi_evaluate_integer(handle, "_STA", NULL, &hdd_present);
if (ACPI_FAILURE(status)) {
pr_err("ACPI call to query HDD protection failed\n");
return 0;
}

if (!hdd_present) {
pr_info("HDD protection not available or using SSD\n");
return 0;
}
Expand Down

0 comments on commit 5545544

Please sign in to comment.