Commit b39c8be6 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for_linus' of...

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
  eeepc-laptop: add missing sparse_keymap_free
  eeepc-wmi: Build fix
  asus: don't modify bluetooth/wlan on boot
  dell-wmi: Fix memory leak
  eeepc-wmi: add backlight support
  eeepc-wmi: use a platform device as parent device of all sub-devices
  eeepc-wmi: add an eeepc_wmi context structure
parents df37bd15 c9db3efe
...@@ -390,6 +390,7 @@ config EEEPC_WMI ...@@ -390,6 +390,7 @@ config EEEPC_WMI
depends on ACPI_WMI depends on ACPI_WMI
depends on INPUT depends on INPUT
depends on EXPERIMENTAL depends on EXPERIMENTAL
select INPUT_SPARSEKMAP
---help--- ---help---
Say Y here if you want to support WMI-based hotkeys on Eee PC laptops. Say Y here if you want to support WMI-based hotkeys on Eee PC laptops.
......
...@@ -79,15 +79,15 @@ static uint wapf = 1; ...@@ -79,15 +79,15 @@ static uint wapf = 1;
module_param(wapf, uint, 0644); module_param(wapf, uint, 0644);
MODULE_PARM_DESC(wapf, "WAPF value"); MODULE_PARM_DESC(wapf, "WAPF value");
static uint wlan_status = 1; static int wlan_status = 1;
static uint bluetooth_status = 1; static int bluetooth_status = 1;
module_param(wlan_status, uint, 0644); module_param(wlan_status, int, 0644);
MODULE_PARM_DESC(wlan_status, "Set the wireless status on boot " MODULE_PARM_DESC(wlan_status, "Set the wireless status on boot "
"(0 = disabled, 1 = enabled, -1 = don't do anything). " "(0 = disabled, 1 = enabled, -1 = don't do anything). "
"default is 1"); "default is 1");
module_param(bluetooth_status, uint, 0644); module_param(bluetooth_status, int, 0644);
MODULE_PARM_DESC(bluetooth_status, "Set the wireless status on boot " MODULE_PARM_DESC(bluetooth_status, "Set the wireless status on boot "
"(0 = disabled, 1 = enabled, -1 = don't do anything). " "(0 = disabled, 1 = enabled, -1 = don't do anything). "
"default is 1"); "default is 1");
......
...@@ -217,6 +217,7 @@ static void dell_wmi_notify(u32 value, void *context) ...@@ -217,6 +217,7 @@ static void dell_wmi_notify(u32 value, void *context)
if (dell_new_hk_type && (buffer_entry[1] != 0x10)) { if (dell_new_hk_type && (buffer_entry[1] != 0x10)) {
printk(KERN_INFO "dell-wmi: Received unknown WMI event" printk(KERN_INFO "dell-wmi: Received unknown WMI event"
" (0x%x)\n", buffer_entry[1]); " (0x%x)\n", buffer_entry[1]);
kfree(obj);
return; return;
} }
...@@ -234,7 +235,7 @@ static void dell_wmi_notify(u32 value, void *context) ...@@ -234,7 +235,7 @@ static void dell_wmi_notify(u32 value, void *context)
key->keycode == KEY_BRIGHTNESSDOWN) && acpi_video) { key->keycode == KEY_BRIGHTNESSDOWN) && acpi_video) {
/* Don't report brightness notifications that will also /* Don't report brightness notifications that will also
* come via ACPI */ * come via ACPI */
return; ;
} else { } else {
input_report_key(dell_wmi_input_dev, key->keycode, 1); input_report_key(dell_wmi_input_dev, key->keycode, 1);
input_sync(dell_wmi_input_dev); input_sync(dell_wmi_input_dev);
......
...@@ -169,7 +169,6 @@ struct eeepc_laptop { ...@@ -169,7 +169,6 @@ struct eeepc_laptop {
struct backlight_device *backlight_device; struct backlight_device *backlight_device;
struct input_dev *inputdev; struct input_dev *inputdev;
struct key_entry *keymap;
struct rfkill *wlan_rfkill; struct rfkill *wlan_rfkill;
struct rfkill *bluetooth_rfkill; struct rfkill *bluetooth_rfkill;
...@@ -1204,8 +1203,8 @@ static int eeepc_input_init(struct eeepc_laptop *eeepc) ...@@ -1204,8 +1203,8 @@ static int eeepc_input_init(struct eeepc_laptop *eeepc)
static void eeepc_input_exit(struct eeepc_laptop *eeepc) static void eeepc_input_exit(struct eeepc_laptop *eeepc)
{ {
if (eeepc->inputdev) { if (eeepc->inputdev) {
sparse_keymap_free(eeepc->inputdev);
input_unregister_device(eeepc->inputdev); input_unregister_device(eeepc->inputdev);
kfree(eeepc->keymap);
} }
} }
......
This diff is collapsed.
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