From 30d71e2607d085b81ca37957f55fb16d39bd9217 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mathieu=20B=C3=A9rard?= Date: Thu, 1 Feb 2007 13:15:40 +0000 Subject: [PATCH] * ACPI wifi/bluetooth : always use all the access methods we have --- acpi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/acpi.c b/acpi.c index 5d0ae43..f9117fa 100644 --- a/acpi.c +++ b/acpi.c @@ -343,15 +343,16 @@ static int set_wireless_status(const struct acpi_backend_data *priv_data, unsign static int omnibook_acpi_set_wireless(const struct omnibook_operation *io_op, unsigned int state) { - int retval; + int retval = -ENODEV; struct acpi_backend_data *priv_data = io_op->backend->data; + /* First try the ANTR/ANTW methods */ if(priv_data->has_antr_antw) - retval = set_wireless_status(priv_data, state); - else if(priv_data->bt_handle) + retval = set_wireless_status(priv_data, state); + + /* Then try the bluetooth ACPI device if present */ + if(priv_data->bt_handle) retval = set_bt_status(priv_data, (state & BT_STA)); - else - retval = -ENODEV; return retval; } -- 2.43.5