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>

diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c
index 5db495dd018e9595fac55f159e6f5a2e5fcd9100..be1d137c60797e96afb3eae9fc4f1c61d0ddf42c 100644 (file)
--- 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;
        }