aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/hotkey.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/hotkey.c')
-rw-r--r--drivers/acpi/hotkey.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/hotkey.c b/drivers/acpi/hotkey.c
index 1ba2db671865..8edfb92f7ede 100644
--- a/drivers/acpi/hotkey.c
+++ b/drivers/acpi/hotkey.c
@@ -265,8 +265,7 @@ static char *format_result(union acpi_object *object)
265 265
266static int hotkey_polling_seq_show(struct seq_file *seq, void *offset) 266static int hotkey_polling_seq_show(struct seq_file *seq, void *offset)
267{ 267{
268 struct acpi_polling_hotkey *poll_hotkey = 268 struct acpi_polling_hotkey *poll_hotkey = seq->private;
269 (struct acpi_polling_hotkey *)seq->private;
270 char *buf; 269 char *buf;
271 270
272 271
@@ -577,7 +576,7 @@ init_poll_hotkey_device(union acpi_hotkey *key, char **config_entry,
577 if (ACPI_FAILURE(status)) 576 if (ACPI_FAILURE(status))
578 goto do_fail_zero; 577 goto do_fail_zero;
579 key->poll_hotkey.poll_result = 578 key->poll_hotkey.poll_result =
580 (union acpi_object *)kmalloc(sizeof(union acpi_object), GFP_KERNEL); 579 kmalloc(sizeof(union acpi_object), GFP_KERNEL);
581 if (!key->poll_hotkey.poll_result) 580 if (!key->poll_hotkey.poll_result)
582 goto do_fail_zero; 581 goto do_fail_zero;
583 return AE_OK; 582 return AE_OK;