Pull bugzilla-7570 into release branch (cb2ebc59) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/acpi/power.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -436,8 +436,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;

		device->power.state = ACPI_STATE_UNKNOWN;

		if (!cl->count && !tl->count) {
		result = -ENODEV;
		goto end;
		@@ -468,12 +466,15 @@ int acpi_power_transition(struct acpi_device *device, int state)
		goto end;
		}

		/* We shouldn't change the state till all above operations succeed */
		device->power.state = state;
		end:
		if (result)
		if (result) {
		device->power.state = ACPI_STATE_UNKNOWN;
		printk(KERN_WARNING PREFIX "Transitioning device [%s] to D%d\n",
		device->pnp.bus_id, state);
		} else {
		/* We shouldn't change the state till all above operations succeed */
		device->power.state = state;
		}

		return result;
		}