From c2d31c3bd770588cc6537e2386eb0f5a244ccdd0 Mon Sep 17 00:00:00 2001 From: Lyude Paul Date: Fri, 19 Feb 2021 16:53:09 -0500 Subject: [PATCH] UPSTREAM: drm/bridge/analogix/dp_core: Unregister DP AUX channel on error in analogix_dp_probe() Just another drive-by fix I noticed while going through the tree to cleanup DP aux adapter registration - make sure we unregister the DP AUX dev if analogix_dp_probe() fails. Signed-off-by: Lyude Paul Reviewed-by: Robert Foss Link: https://patchwork.freedesktop.org/patch/msgid/20210219215326.2227596-14-lyude@redhat.com (cherry picked from commit b3bdf89c026021194b1c09e772e6ac3d043409e5) Change-Id: I874281fb7980372af9fa19965400f1b2fd00168e --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 256b4075bdc8..be4a5f67f261 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -2081,6 +2081,7 @@ int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev) err_disable_pm_runtime: pm_runtime_put(dp->dev); pm_runtime_disable(dp->dev); + drm_dp_aux_unregister(&dp->aux); return ret; }