diff mbox

toshiba_bluetooth: Decouple an error checking status code

Message ID 20160907152815.5950-4-coproscefalo@gmail.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Azael Avalos Sept. 7, 2016, 3:28 p.m. UTC 
This patch simply decouples te 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>
---
 drivers/platform/x86/toshiba_bluetooth.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Darren Hart Sept. 23, 2016, 11:19 p.m. UTC | #1 
On Wed, Sep 07, 2016 at 09:28:15AM -0600, Azael Avalos wrote:
> This patch simply decouples te 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>

Queued, thanks.
diff mbox

Patch

diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c
index 5db495dd..be1d137 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;
 	}