Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4c0de31 authored by Erik Schmauss's avatar Erik Schmauss Committed by Rafael J. Wysocki
Browse files

ACPICA: Events: add a return on failure from acpi_hw_register_read 



This ensures that acpi_ev_fixed_event_detect() does not use fixed_status
and and fixed_enable as uninitialized variables.

Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 95857638

drivers/acpi/acpica/evevent.c

+7 −2
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ u32 acpi_ev_fixed_event_detect(void) 
	u32 fixed_status;

	u32 fixed_enable;

	u32 i;

	acpi_status status;



	ACPI_FUNCTION_NAME(ev_fixed_event_detect);
@@ -177,8 +178,12 @@ u32 acpi_ev_fixed_event_detect(void) 
	 * Read the fixed feature status and enable registers, as all the cases

	 * depend on their values. Ignore errors here.

	 */

	(void)acpi_hw_register_read(ACPI_REGISTER_PM1_STATUS, &fixed_status);

	(void)acpi_hw_register_read(ACPI_REGISTER_PM1_ENABLE, &fixed_enable);

	status = acpi_hw_register_read(ACPI_REGISTER_PM1_STATUS, &fixed_status);

	status |=

	    acpi_hw_register_read(ACPI_REGISTER_PM1_ENABLE, &fixed_enable);

	if (ACPI_FAILURE(status)) {

		return (int_status);

	}



	ACPI_DEBUG_PRINT((ACPI_DB_INTERRUPTS,

			  "Fixed Event Block: Enable %08X Status %08X\n",