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 bf7bc25e680e..bfae3ffff13c 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1146,7 +1146,7 @@ static int asus_hotk_get_info(void)
1146 if (ACPI_FAILURE(status)) 1146 if (ACPI_FAILURE(status))
1147 printk(KERN_WARNING " Couldn't get the DSDT table header\n"); 1147 printk(KERN_WARNING " Couldn't get the DSDT table header\n");
1148 else 1148 else
1149 asus_info = (struct acpi_table_header *)dsdt.pointer; 1149 asus_info = dsdt.pointer;
1150 1150
1151 /* We have to write 0 on init this far for all ASUS models */ 1151 /* We have to write 0 on init this far for all ASUS models */
1152 if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) { 1152 if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) {
@@ -1168,7 +1168,7 @@ static int asus_hotk_get_info(void)
1168 * asus_model_match() and try something completely different. 1168 * asus_model_match() and try something completely different.
1169 */ 1169 */
1170 if (buffer.pointer) { 1170 if (buffer.pointer) {
1171 model = (union acpi_object *)buffer.pointer; 1171 model = buffer.pointer;
1172 switch (model->type) { 1172 switch (model->type) {
1173 case ACPI_TYPE_STRING: 1173 case ACPI_TYPE_STRING:
1174 string = model->string.pointer; 1174 string = model->string.pointer;
@@ -1264,8 +1264,7 @@ static int asus_hotk_add(struct acpi_device *device)
1264 printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n", 1264 printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n",
1265 ASUS_ACPI_VERSION); 1265 ASUS_ACPI_VERSION);
1266 1266
1267 hotk = 1267 hotk = kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);
1268 (struct asus_hotk *)kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);
1269 if (!hotk) 1268 if (!hotk)
1270 return -ENOMEM; 1269 return -ENOMEM;
1271 memset(hotk, 0, sizeof(struct asus_hotk)); 1270 memset(hotk, 0, sizeof(struct asus_hotk));