瀏覽代碼

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>
Azael Avalos 9 年之前
父節點
當前提交
28e476d743
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      drivers/platform/x86/toshiba_bluetooth.c

+ 3 - 1
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;
 	}