summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorAzael Avalos <coproscefalo@gmail.com>2016-09-07 17:28:15 +0200
committerDarren Hart <dvhart@linux.intel.com>2016-09-24 01:21:06 +0200
commit28e476d7438eedd3ecc7b5ebe6f2a3dfd21ca10e (patch)
tree942b3653ae6191adc7be9486b277bce6ecdf375f /drivers/platform
parentplatform/x86: toshiba_haps: Change logging level from info to debug (diff)
downloadlinux-28e476d7438eedd3ecc7b5ebe6f2a3dfd21ca10e.tar.xz
linux-28e476d7438eedd3ecc7b5ebe6f2a3dfd21ca10e.zip
platform/x86: toshiba_bluetooth: Decouple an error checking status code
This patch simply decouples the error checking of the ACPI status and the actual BT status, as those two were nested in an if/else check, but are completely unrelated. Signed-off-by: Azael Avalos <coproscefalo@gmail.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/toshiba_bluetooth.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c
index 5db495dd018e..be1d137c6079 100644
--- a/drivers/platform/x86/toshiba_bluetooth.c
+++ b/drivers/platform/x86/toshiba_bluetooth.c
@@ -80,7 +80,9 @@ static int toshiba_bluetooth_present(acpi_handle handle)
if (ACPI_FAILURE(result)) {
pr_err("ACPI call to query Bluetooth presence failed\n");
return -ENXIO;
- } else if (!bt_present) {
+ }
+
+ if (!bt_present) {
pr_info("Bluetooth device not present\n");
return -ENODEV;
}