Skip to content

Commit f39de44

Browse files
jwrdegoederafaeljw
authored andcommitted
ACPI: Remove redundant clearing of context->ret.pointer from acpi_run_osc()
context->ret.pointer already gets set to NULL at the beginning of acpi_run_osc() and it only gets assigned a new value in the success path near the end of acpi_run_osc(), so the clearing of context->ret.pointer (when status != AE_OK) at the end of acpi_run_osc() is redundant since it will always already be NULL when status != AE_OK. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 614124b commit f39de44

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

drivers/acpi/bus.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,6 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
262262

263263
out_kfree:
264264
kfree(output.pointer);
265-
if (status != AE_OK)
266-
context->ret.pointer = NULL;
267265
return status;
268266
}
269267
EXPORT_SYMBOL(acpi_run_osc);

0 commit comments

Comments
 (0)