Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-09 12:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

platform/x86: toshiba_haps: Split ACPI and HDD protection error handling

Browse Source 
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>
This commit is contained in:
Azael Avalos 2016-09-07 09:28:13 -06:00 committed by Darren Hart
parent 6f7e357bf1
commit 5545544998
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/platform/x86/toshiba_haps.c
View File

@ -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;
}