ACPI: Always check if _PRW is present before trying to evaluate it (86e4e20e) · Commits · 戴 / test

Before evaluating _PRW for devices that are reported as inactive or not present by their _STA control methods we should check if those methods are actually present (otherwise the evaulation of _PRW will obviously fail and a scary message will be printed unnecessarily). Reported-by:

Andreas Mohr <andi@lisas.de> Reported-by:

Maciej Rutecki <maciej.rutecki@gmail.com> Signed-off-by:

Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by:

Len Brown <len.brown@intel.com>

drivers/acpi/scan.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -1388,7 +1388,6 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl,
		struct acpi_bus_ops *ops = context;
		int type;
		unsigned long long sta;
		struct acpi_device_wakeup wakeup;
		struct acpi_device *device;
		acpi_status status;
		int result;
		@@ -1399,7 +1398,13 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl,

		if (!(sta & ACPI_STA_DEVICE_PRESENT) &&
		!(sta & ACPI_STA_DEVICE_FUNCTIONING)) {
		acpi_bus_extract_wakeup_device_power_package(handle, &wakeup);
		struct acpi_device_wakeup wakeup;
		acpi_handle temp;

		status = acpi_get_handle(handle, "_PRW", &temp);
		if (ACPI_SUCCESS(status))
		acpi_bus_extract_wakeup_device_power_package(handle,
		&wakeup);
		return AE_CTRL_DEPTH;
		}

Admin message