| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1323934059-1221-7-git-send-email-corentincj@iksaif.net> Date: Thu, 15 Dec 2011 08:27:36 +0100 From: Corentin Chary <corentincj@...aif.net> To: Matthew Garrett <mjg@...hat.com> Cc: Corentin Chary <corentin.chary@...il.com>, Corentin Chary <corentincj@...aif.net>, acpi4asus-user@...ts.sourceforge.net, platform-driver-x86@...r.kernel.org, linux-kernel@...r.kernel.org Subject: [PATCH 6/9] asus-laptop: check WLED and BLED presence before adding rfkill From: Corentin Chary <corentin.chary@...il.com> Signed-off-by: Corentin Chary <corentin.chary@...il.com> --- drivers/platform/x86/asus-laptop.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index 0bdd966..847c8ad 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c @@ -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, -- 1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists