Commit ba98413b authored by Johan Hovold's avatar Johan Hovold Committed by Neil Armstrong

drm/meson: fix missing component unbind on bind errors

Make sure to unbind all subcomponents when binding the aggregate device
fails.

Fixes: a41e82e6 ("drm/meson: Add support for components")
Cc: stable@vger.kernel.org      # 4.12
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Acked-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230306103533.4915-1-johan+linaro@kernel.org
parent 03aecb1a
...@@ -325,23 +325,23 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) ...@@ -325,23 +325,23 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
ret = meson_encoder_hdmi_init(priv); ret = meson_encoder_hdmi_init(priv);
if (ret) if (ret)
goto exit_afbcd; goto unbind_all;
ret = meson_plane_create(priv); ret = meson_plane_create(priv);
if (ret) if (ret)
goto exit_afbcd; goto unbind_all;
ret = meson_overlay_create(priv); ret = meson_overlay_create(priv);
if (ret) if (ret)
goto exit_afbcd; goto unbind_all;
ret = meson_crtc_create(priv); ret = meson_crtc_create(priv);
if (ret) if (ret)
goto exit_afbcd; goto unbind_all;
ret = request_irq(priv->vsync_irq, meson_irq, 0, drm->driver->name, drm); ret = request_irq(priv->vsync_irq, meson_irq, 0, drm->driver->name, drm);
if (ret) if (ret)
goto exit_afbcd; goto unbind_all;
drm_mode_config_reset(drm); drm_mode_config_reset(drm);
...@@ -359,6 +359,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) ...@@ -359,6 +359,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
uninstall_irq: uninstall_irq:
free_irq(priv->vsync_irq, drm); free_irq(priv->vsync_irq, drm);
unbind_all:
if (has_components)
component_unbind_all(drm->dev, drm);
exit_afbcd: exit_afbcd:
if (priv->afbcd.ops) if (priv->afbcd.ops)
priv->afbcd.ops->exit(priv); priv->afbcd.ops->exit(priv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment