Merge "drm/msm/dp: fix controller state update during disconnect event" into msm-4.14

drivers/gpu/drm/msm/dp/dp_ctrl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ static void dp_ctrl_push_idle(struct dp_ctrl *dp_ctrl, enum dp_stream_id strm)

		ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl);

		if (!ctrl->power_on \|\| atomic_read(&ctrl->aborted)) {
		if (!ctrl->power_on) {
		pr_err("CTRL off, return\n");
		return;
		}