Skip to content

Commit

Permalink
asus-laptop: check WLED and BLED presence before adding rfkill
Browse files Browse the repository at this point in the history
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
  • Loading branch information
Corentin Chary authored and Matthew Garrett committed Mar 20, 2012
1 parent 3c8671f commit 26594dd
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/platform/x86/asus-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 26594dd

Please sign in to comment.