platform/x86: toshiba_bluetooth: Decouple an error checking status code
authorAzael Avalos <coproscefalo@gmail.com>
Wed, 7 Sep 2016 15:28:15 +0000 (09:28 -0600)
committerDarren Hart <dvhart@linux.intel.com>
Fri, 23 Sep 2016 23:21:06 +0000 (16:21 -0700)
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>
drivers/platform/x86/toshiba_bluetooth.c

index 5db495d..be1d137 100644 (file)
@@ -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;
        }