ACPI / sysfs: fix error code in get_status() (f18ebc21) · Commits · 戴 / test

The problem with ornamental, do-nothing gotos is that they lead to "forgot to set the error code" bugs. We should be returning -EINVAL here but we don't. It leads to an uninitalized variable in counter_show(): drivers/acpi/sysfs.c:603 counter_show() error: uninitialized symbol 'status'. Fixes: (ACPI: introduce drivers/acpi/sysfs.c) Signed-off-by:

Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

drivers/acpi/sysfs.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -555,23 +555,22 @@ static void acpi_global_event_handler(u32 event_type, acpi_handle device,
		static int get_status(u32 index, acpi_event_status *status,
		acpi_handle *handle)
		{
		int result = 0;
		int result;

		if (index >= num_gpes + ACPI_NUM_FIXED_EVENTS)
		goto end;
		return -EINVAL;

		if (index < num_gpes) {
		result = acpi_get_gpe_device(index, handle);
		if (result) {
		ACPI_EXCEPTION((AE_INFO, AE_NOT_FOUND,
		"Invalid GPE 0x%x", index));
		goto end;
		return result;
		}
		result = acpi_get_gpe_status(*handle, index, status);
		} else if (index < (num_gpes + ACPI_NUM_FIXED_EVENTS))
		result = acpi_get_event_status(index - num_gpes, status);

		end:
		return result;
		}

Admin message