commit 26594dd47669ec213297b25fae20cdbb21f877b8
author Corentin Chary <corentin.chary@gmail.com> Thu Dec 15 08:27:36 2011 +0100
committer Matthew Garrett <mjg@redhat.com> Tue Mar 20 12:02:17 2012 -0400
tree fe45ca903059862b977609c1faa560e896c3dd44
parent 3c8671ffd334cfb692089ec00141b56d5a796ae7

asus-laptop: check WLED and BLED presence before adding rfkill

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>

drivers/platform/x86/asus-laptop.c

diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 547b9eb..c1125b3 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -1361,14 +1361,16 @@
 		goto exit;
 
 
-	if (asus->wled_type == TYPE_RFKILL)
+	if (!acpi_check_handle(asus->handle, METHOD_WLAN, NULL) &&
+	    asus->wled_type == TYPE_RFKILL)
 		result = asus_rfkill_setup(asus, &asus->wlan, "asus-wlan",
 					   WL_RSTS, RFKILL_TYPE_WLAN,
 					   &asus_rfkill_ops);
 	if (result)
 		goto exit;
 
-	if (asus->bled_type == TYPE_RFKILL)
+	if (!acpi_check_handle(asus->handle, METHOD_BLUETOOTH, NULL) &&
+	    asus->bled_type == TYPE_RFKILL)
 		result = asus_rfkill_setup(asus, &asus->bluetooth,
 					   "asus-bluetooth", BT_RSTS,
 					   RFKILL_TYPE_BLUETOOTH,