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

Commit 855977ef authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'bugzilla-16271' into release

parents 840ba24d 3d695839

drivers/acpi/acpica/evxfevnt.c

+11 −8
Original line number Original line Diff line number Diff line
@@ -70,6 +70,7 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info, 
acpi_status acpi_enable(void)

acpi_status acpi_enable(void)

{

{

	acpi_status status;

	acpi_status status;

	int retry;





	ACPI_FUNCTION_TRACE(acpi_enable);

	ACPI_FUNCTION_TRACE(acpi_enable);
@@ -98,16 +99,18 @@ acpi_status acpi_enable(void) 




	/* Sanity check that transition succeeded */

	/* Sanity check that transition succeeded */





	if (acpi_hw_get_mode() != ACPI_SYS_MODE_ACPI) {

	for (retry = 0; retry < 30000; ++retry) {

		ACPI_ERROR((AE_INFO,

		if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) {

			    "Hardware did not enter ACPI mode"));

			if (retry != 0)

		return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);

				ACPI_WARNING((AE_INFO,

				"Platform took > %d00 usec to enter ACPI mode", retry));

			return_ACPI_STATUS(AE_OK);

		}

		acpi_os_stall(100);	/* 100 usec */

	}

	}





	ACPI_DEBUG_PRINT((ACPI_DB_INIT,

	ACPI_ERROR((AE_INFO, "Hardware did not enter ACPI mode"));

			  "Transition to ACPI mode successful\n"));

	return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);



	return_ACPI_STATUS(AE_OK);

}

}





ACPI_EXPORT_SYMBOL(acpi_enable)

ACPI_EXPORT_SYMBOL(acpi_enable)