OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Corentin Chary 2011-12-15 08:27:36 +01:00 committed by Matthew Garrett
parent 3c8671ffd3
commit 26594dd476
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/platform/x86/asus-laptop.c
View File

@ -1361,14 +1361,16 @@ static int asus_rfkill_init(struct asus_laptop *asus)
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,