aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/asus_acpi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/asus_acpi.c')
-rw-r--r--drivers/acpi/asus_acpi.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index e9ee4c52a5f6..f7db8ea7ac0a 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1128,7 +1128,7 @@ static int asus_hotk_get_info(void)
1128 if (ACPI_FAILURE(status)) 1128 if (ACPI_FAILURE(status))
1129 printk(KERN_WARNING " Couldn't get the DSDT table header\n"); 1129 printk(KERN_WARNING " Couldn't get the DSDT table header\n");
1130 else 1130 else
1131 asus_info = (struct acpi_table_header *)dsdt.pointer; 1131 asus_info = dsdt.pointer;
1132 1132
1133 /* We have to write 0 on init this far for all ASUS models */ 1133 /* We have to write 0 on init this far for all ASUS models */
1134 if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) { 1134 if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) {
@@ -1150,7 +1150,7 @@ static int asus_hotk_get_info(void)
1150 * asus_model_match() and try something completely different. 1150 * asus_model_match() and try something completely different.
1151 */ 1151 */
1152 if (buffer.pointer) { 1152 if (buffer.pointer) {
1153 model = (union acpi_object *)buffer.pointer; 1153 model = buffer.pointer;
1154 switch (model->type) { 1154 switch (model->type) {
1155 case ACPI_TYPE_STRING: 1155 case ACPI_TYPE_STRING:
1156 string = model->string.pointer; 1156 string = model->string.pointer;
@@ -1245,8 +1245,7 @@ static int asus_hotk_add(struct acpi_device *device)
1245 printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n", 1245 printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n",
1246 ASUS_ACPI_VERSION); 1246 ASUS_ACPI_VERSION);
1247 1247
1248 hotk = 1248 hotk = kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);
1249 (struct asus_hotk *)kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);
1250 if (!hotk) 1249 if (!hotk)
1251 return -ENOMEM; 1250 return -ENOMEM;
1252 memset(hotk, 0, sizeof(struct asus_hotk)); 1251 memset(hotk, 0, sizeof(struct asus_hotk));