diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-09-17 21:53:41 -0300 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-09-23 15:42:04 -0400 |
| commit | fc6e756894b703952fd277a1f98a5d93e7ba847a (patch) | |
| tree | bf4853c75ebf45d863ce53b619ea265aa303e5b7 /drivers/platform | |
| parent | 58e226c6d44b250641e229b306030da5c84e4341 (diff) | |
| download | linux-stable-fc6e756894b703952fd277a1f98a5d93e7ba847a.tar.gz linux-stable-fc6e756894b703952fd277a1f98a5d93e7ba847a.tar.bz2 linux-stable-fc6e756894b703952fd277a1f98a5d93e7ba847a.zip | |
thinkpad-acpi: avoid keymap pitfall
Change the code so that it will use the correct size for keymap entries.
Do it in a way that makes it harder to screw it up in the future.
Reported-by: Jaime Velasco Juan <jsagarribay@gmail.com>
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index e35ed128bdef..2d61186ad5a2 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -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; |