From f32147a6067de39ac783094fa7a8178518c7c101 Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Sun, 6 Feb 2011 13:28:30 +0100 Subject: [PATCH] --- yaml --- r: 243063 b: refs/heads/master c: 7898cf1a3665d22c4d16308f73e981c6464be81b h: refs/heads/master i: 243061: 295f444748ca4e0252d6d4868f67ff300307df21 243059: 739c7a1ad2d88577e374d91f4de45f13fb315243 243055: ef622a79ab076b2ed9b6afd891dd872c5b4541d6 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/eeepc-wmi.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dc748d669e7d..cafe2f4cad13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 279f8f95493c9aaa0a85520c863ccba87c4bf930 +refs/heads/master: 7898cf1a3665d22c4d16308f73e981c6464be81b diff --git a/trunk/drivers/platform/x86/eeepc-wmi.c b/trunk/drivers/platform/x86/eeepc-wmi.c index eb4c0ce88ac1..d8234582b541 100644 --- a/trunk/drivers/platform/x86/eeepc-wmi.c +++ b/trunk/drivers/platform/x86/eeepc-wmi.c @@ -588,8 +588,14 @@ static int eeepc_rfkill_set(void *data, bool blocked) { int dev_id = (unsigned long)data; u32 ctrl_param = !blocked; + acpi_status status; + + status = eeepc_wmi_set_devstate(dev_id, ctrl_param, NULL); + + if (ACPI_FAILURE(status)) + return -EIO; - return eeepc_wmi_set_devstate(dev_id, ctrl_param, NULL); + return 0; } static void eeepc_rfkill_query(struct rfkill *rfkill, void *data)