summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlex Hung <alex.hung@canonical.com>2017-04-06 17:32:16 +0100
committerDarren Hart (VMware) <dvhart@infradead.org>2017-04-13 11:34:26 -0700
commit05aa43cce0e287a87e686931d65707953bc60d07 (patch)
tree13f8113c3d6d97a03524a75c293477b852a2f060 /drivers
parent5b7bb3a79da05a5f49445c13f240e286a3d5b8a8 (diff)
downloadlinux-stable-05aa43cce0e287a87e686931d65707953bc60d07.tar.gz
linux-stable-05aa43cce0e287a87e686931d65707953bc60d07.tar.bz2
linux-stable-05aa43cce0e287a87e686931d65707953bc60d07.zip
platform/x86: hp-wireless: add Xiaomi's hardware id to the supported list
The airplane mode button on Xiaomi's new laptops are the same as HP laptops. This is tested on Xiaomi Notebook Air 13. Signed-off-by: Alex Hung <alex.hung@canonical.com> [dvhart: Dropped module init/exit info messages] Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/hp-wireless.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/platform/x86/hp-wireless.c b/drivers/platform/x86/hp-wireless.c
index 988eedbd7c63..d860ea0d0e60 100644
--- a/drivers/platform/x86/hp-wireless.c
+++ b/drivers/platform/x86/hp-wireless.c
@@ -1,7 +1,7 @@
/*
- * hp-wireless button for Windows 8
+ * Airplane mode button for HP & Xiaomi laptops
*
- * Copyright (C) 2014 Alex Hung <alex.hung@canonical.com>
+ * Copyright (C) 2014-2017 Alex Hung <alex.hung@canonical.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -29,11 +29,13 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Alex Hung");
MODULE_ALIAS("acpi*:HPQ6001:*");
+MODULE_ALIAS("acpi*:WSTADEF:*");
static struct input_dev *hpwl_input_dev;
static const struct acpi_device_id hpwl_ids[] = {
{"HPQ6001", 0},
+ {"WSTADEF", 0},
{"", 0},
};
@@ -112,7 +114,6 @@ static int __init hpwl_init(void)
{
int err;
- pr_info("Initializing HPQ6001 module\n");
err = acpi_bus_register_driver(&hpwl_driver);
if (err)
pr_err("Unable to register HP wireless control driver.\n");
@@ -122,7 +123,6 @@ static int __init hpwl_init(void)
static void __exit hpwl_exit(void)
{
- pr_info("Exiting HPQ6001 module\n");
acpi_bus_unregister_driver(&hpwl_driver);
}