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

Commit f6139849 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'power' into release

parents 3e0fe364 676962da

drivers/acpi/power.c

+2 −6
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ static int acpi_power_get_state(acpi_handle handle, int *state) 
			      ACPI_POWER_RESOURCE_STATE_OFF;



	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] is %s\n",

			  acpi_ut_get_node_name(handle), state ? "on" : "off"));

			  acpi_ut_get_node_name(handle),

				*state ? "on" : "off"));



	return 0;

}
@@ -515,11 +516,6 @@ int acpi_power_transition(struct acpi_device *device, int state) 
	cl = &device->power.states[device->power.state].resources;

	tl = &device->power.states[state].resources;



	if (!cl->count && !tl->count) {

		result = -ENODEV;

		goto end;

	}



	/* TBD: Resources must be ordered. */



	/*