[PATCH] toshiba_acpi: return on a fail path

From: Jiri Slaby
Date: Mon Jul 13 2009 - 17:33:35 EST


Return from bt_rfkill_poll when hci_get_radio_state fails.

value is invalid in that case and should not be assigned to the
rfkill state.

This also fixes a double unlock bug.

Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
---
drivers/platform/x86/toshiba_acpi.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 81d31ea..51c0a8b 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -335,6 +335,7 @@ static void bt_rfkill_poll(struct rfkill *rfkill, void *data)
if (hci_result != HCI_SUCCESS) {
/* Can't do anything useful */
mutex_unlock(&dev->mutex);
+ return;
}

new_rfk_state = value;
--
1.6.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/