Commit 26594dd4 authored by Corentin Chary's avatar Corentin Chary Committed by Matthew Garrett

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

Signed-off-by: default avatarCorentin Chary <corentin.chary@gmail.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 3c8671ff
...@@ -1361,14 +1361,16 @@ static int asus_rfkill_init(struct asus_laptop *asus) ...@@ -1361,14 +1361,16 @@ static int asus_rfkill_init(struct asus_laptop *asus)
goto exit; 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", result = asus_rfkill_setup(asus, &asus->wlan, "asus-wlan",
WL_RSTS, RFKILL_TYPE_WLAN, WL_RSTS, RFKILL_TYPE_WLAN,
&asus_rfkill_ops); &asus_rfkill_ops);
if (result) if (result)
goto exit; 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, result = asus_rfkill_setup(asus, &asus->bluetooth,
"asus-bluetooth", BT_RSTS, "asus-bluetooth", BT_RSTS,
RFKILL_TYPE_BLUETOOTH, RFKILL_TYPE_BLUETOOTH,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment