Merge "drm: msm: sde: handle event disable failure" (57d865b1) · Commits · e / devices / android_kernel_fairphone_FP4

msm/sde/sde_crtc.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -6258,7 +6258,7 @@ static int _sde_crtc_event_disable(struct sde_kms *kms,
		spin_lock_irqsave(&crtc->spin_lock, flags);
		list_for_each_entry(node, &crtc->user_event_list, list) {
		if (node->event == event) {
		list_del(&node->list);
		list_del_init(&node->list);
		found = true;
		break;
		}
		@@ -6286,7 +6286,14 @@ static int _sde_crtc_event_disable(struct sde_kms *kms,
		}

		ret = node->func(crtc_drm, false, &node->irq);
		if (ret) {
		spin_lock_irqsave(&crtc->spin_lock, flags);
		list_add_tail(&node->list, &crtc->user_event_list);
		spin_unlock_irqrestore(&crtc->spin_lock, flags);
		} else {
		kfree(node);
		}

		pm_runtime_put_sync(crtc_drm->dev->dev);
		return ret;
		}