diff options
| author | Azael Avalos <coproscefalo@gmail.com> | 2016-09-07 11:28:15 -0400 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2016-09-23 19:21:06 -0400 |
| commit | 28e476d7438eedd3ecc7b5ebe6f2a3dfd21ca10e (patch) | |
| tree | 942b3653ae6191adc7be9486b277bce6ecdf375f /drivers/platform | |
| parent | baae5f91577ac6416b03c3d95815f52e1e244f3b (diff) | |
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.c | 4 |
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) | |||
| 80 | if (ACPI_FAILURE(result)) { | 80 | if (ACPI_FAILURE(result)) { |
| 81 | pr_err("ACPI call to query Bluetooth presence failed\n"); | 81 | pr_err("ACPI call to query Bluetooth presence failed\n"); |
| 82 | return -ENXIO; | 82 | return -ENXIO; |
| 83 | } else if (!bt_present) { | 83 | } |
| 84 | |||
| 85 | if (!bt_present) { | ||
| 84 | pr_info("Bluetooth device not present\n"); | 86 | pr_info("Bluetooth device not present\n"); |
| 85 | return -ENODEV; | 87 | return -ENODEV; |
| 86 | } | 88 | } |
