Skip to content

Commit ba98413

Browse files
jhovoldsuperna9999
authored andcommitted
drm/meson: fix missing component unbind on bind errors
Make sure to unbind all subcomponents when binding the aggregate device fails. Fixes: a41e82e ("drm/meson: Add support for components") Cc: stable@vger.kernel.org # 4.12 Cc: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Acked-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20230306103533.4915-1-johan+linaro@kernel.org
1 parent 03aecb1 commit ba98413

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

drivers/gpu/drm/meson/meson_drv.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,23 +325,23 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
325325

326326
ret = meson_encoder_hdmi_init(priv);
327327
if (ret)
328-
goto exit_afbcd;
328+
goto unbind_all;
329329

330330
ret = meson_plane_create(priv);
331331
if (ret)
332-
goto exit_afbcd;
332+
goto unbind_all;
333333

334334
ret = meson_overlay_create(priv);
335335
if (ret)
336-
goto exit_afbcd;
336+
goto unbind_all;
337337

338338
ret = meson_crtc_create(priv);
339339
if (ret)
340-
goto exit_afbcd;
340+
goto unbind_all;
341341

342342
ret = request_irq(priv->vsync_irq, meson_irq, 0, drm->driver->name, drm);
343343
if (ret)
344-
goto exit_afbcd;
344+
goto unbind_all;
345345

346346
drm_mode_config_reset(drm);
347347

@@ -359,6 +359,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
359359

360360
uninstall_irq:
361361
free_irq(priv->vsync_irq, drm);
362+
unbind_all:
363+
if (has_components)
364+
component_unbind_all(drm->dev, drm);
362365
exit_afbcd:
363366
if (priv->afbcd.ops)
364367
priv->afbcd.ops->exit(priv);

0 commit comments

Comments
 (0)