Pull apm-freeze-fix into release branch (92131481) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/char/apm-emulation.c

+8 −7

Original line number	Diff line number	Diff line
		@@ -295,7 +295,6 @@ static int
		apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
		{
		struct apm_user *as = filp->private_data;
		unsigned long flags;
		int err = -EINVAL;

		if (!as->suser \|\| !as->writer)
		@@ -331,10 +330,16 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
		* Wait for the suspend/resume to complete. If there
		* are pending acknowledges, we wait here for them.
		*/
		flags = current->flags;
		freezer_do_not_count();

		wait_event(apm_suspend_waitqueue,
		as->suspend_state == SUSPEND_DONE);

		/*
		* Since we are waiting until the suspend is done, the
		* try_to_freeze() in freezer_count() will not trigger
		*/
		freezer_count();
		} else {
		as->suspend_state = SUSPEND_WAIT;
		mutex_unlock(&state_lock);
		@@ -362,14 +367,10 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
		* Wait for the suspend/resume to complete. If there
		* are pending acknowledges, we wait here for them.
		*/
		flags = current->flags;

		wait_event_interruptible(apm_suspend_waitqueue,
		wait_event_freezable(apm_suspend_waitqueue,
		as->suspend_state == SUSPEND_DONE);
		}

		current->flags = flags;

		mutex_lock(&state_lock);
		err = as->suspend_result;
		as->suspend_state = SUSPEND_NONE;