diff options
-rw-r--r-- | drivers/platform/x86/acer-wmi.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index dec558ee29e5..652ca1800a0a 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c | |||
@@ -772,6 +772,7 @@ static acpi_status WMID_set_capabilities(void) | |||
772 | obj->buffer.length == sizeof(u32)) { | 772 | obj->buffer.length == sizeof(u32)) { |
773 | devices = *((u32 *) obj->buffer.pointer); | 773 | devices = *((u32 *) obj->buffer.pointer); |
774 | } else { | 774 | } else { |
775 | kfree(out.pointer); | ||
775 | return AE_ERROR; | 776 | return AE_ERROR; |
776 | } | 777 | } |
777 | 778 | ||
@@ -788,6 +789,7 @@ static acpi_status WMID_set_capabilities(void) | |||
788 | if (!(devices & 0x20)) | 789 | if (!(devices & 0x20)) |
789 | max_brightness = 0x9; | 790 | max_brightness = 0x9; |
790 | 791 | ||
792 | kfree(out.pointer); | ||
791 | return status; | 793 | return status; |
792 | } | 794 | } |
793 | 795 | ||
@@ -1094,6 +1096,7 @@ static u32 get_wmid_devices(void) | |||
1094 | struct acpi_buffer out = {ACPI_ALLOCATE_BUFFER, NULL}; | 1096 | struct acpi_buffer out = {ACPI_ALLOCATE_BUFFER, NULL}; |
1095 | union acpi_object *obj; | 1097 | union acpi_object *obj; |
1096 | acpi_status status; | 1098 | acpi_status status; |
1099 | u32 devices = 0; | ||
1097 | 1100 | ||
1098 | status = wmi_query_block(WMID_GUID2, 1, &out); | 1101 | status = wmi_query_block(WMID_GUID2, 1, &out); |
1099 | if (ACPI_FAILURE(status)) | 1102 | if (ACPI_FAILURE(status)) |
@@ -1102,10 +1105,11 @@ static u32 get_wmid_devices(void) | |||
1102 | obj = (union acpi_object *) out.pointer; | 1105 | obj = (union acpi_object *) out.pointer; |
1103 | if (obj && obj->type == ACPI_TYPE_BUFFER && | 1106 | if (obj && obj->type == ACPI_TYPE_BUFFER && |
1104 | obj->buffer.length == sizeof(u32)) { | 1107 | obj->buffer.length == sizeof(u32)) { |
1105 | return *((u32 *) obj->buffer.pointer); | 1108 | devices = *((u32 *) obj->buffer.pointer); |
1106 | } else { | ||
1107 | return 0; | ||
1108 | } | 1109 | } |
1110 | |||
1111 | kfree(out.pointer); | ||
1112 | return devices; | ||
1109 | } | 1113 | } |
1110 | 1114 | ||
1111 | /* | 1115 | /* |