Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91e71c12 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  thinkpad-acpi: avoid keymap pitfall
  Change MSI LAPTOP driver maintainer to Lee, Chun-Yi
parents ed3473b1 fc6e7568

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -3905,10 +3905,8 @@ F: Documentation/serial/moxa-smartio 
F:	drivers/char/mxser.*



MSI LAPTOP SUPPORT

M:	Lennart Poettering <mzxreary@0pointer.de>

M:	Lee, Chun-Yi <jlee@novell.com>

L:	platform-driver-x86@vger.kernel.org

W:	https://tango.0pointer.de/mailman/listinfo/s270-linux

W:	http://0pointer.de/lennart/tchibo.html

S:	Maintained

F:	drivers/platform/x86/msi-laptop.c

drivers/platform/x86/thinkpad_acpi.c

+3 −2
Original line number Diff line number Diff line
@@ -3093,7 +3093,8 @@ static const struct tpacpi_quirk tpacpi_hotkey_qtable[] __initconst = { 
	TPACPI_Q_IBM('1', 'D', TPACPI_HK_Q_INIMASK), /* X22, X23, X24 */

};



typedef u16 tpacpi_keymap_t[TPACPI_HOTKEY_MAP_LEN];

typedef u16 tpacpi_keymap_entry_t;

typedef tpacpi_keymap_entry_t tpacpi_keymap_t[TPACPI_HOTKEY_MAP_LEN];



static int __init hotkey_init(struct ibm_init_struct *iibm)

{
@@ -3230,7 +3231,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) 
	};



#define TPACPI_HOTKEY_MAP_SIZE		sizeof(tpacpi_keymap_t)

#define TPACPI_HOTKEY_MAP_TYPESIZE	sizeof(tpacpi_keymap_t[0])

#define TPACPI_HOTKEY_MAP_TYPESIZE	sizeof(tpacpi_keymap_entry_t)



	int res, i;

	int status;