[PATCH v5 13/21] drm/bridge: sn65dsi83: Fix bridge removal

Marek Vasut marex at denx.de
Fri Oct 22 20:02:24 UTC 2021


On 10/21/21 9:39 AM, Maxime Ripard wrote:
> Commit 24417d5b0c00 ("drm/bridge: ti-sn65dsi83: Implement .detach
> callback") moved the unregistration of the bridge DSI device and bridge
> itself to the detach callback.
> 
> While this is correct for the DSI device detach and unregistration, the
> bridge is added in the driver probe, and should thus be removed as part
> of its remove callback.
> 
> Cc: Marek Vasut <marex at denx.de>
> Fixes: 24417d5b0c00 ("drm/bridge: ti-sn65dsi83: Implement .detach callback")
> Signed-off-by: Maxime Ripard <maxime at cerno.tech>
> ---
>   drivers/gpu/drm/bridge/ti-sn65dsi83.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> index 52030a82f3e1..3bfd07caf8d7 100644
> --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
> @@ -297,7 +297,6 @@ static void sn65dsi83_detach(struct drm_bridge *bridge)
>   
>   	mipi_dsi_detach(ctx->dsi);
>   	mipi_dsi_device_unregister(ctx->dsi);
> -	drm_bridge_remove(&ctx->bridge);
>   	ctx->dsi = NULL;
>   }
>   
> @@ -693,6 +692,7 @@ static int sn65dsi83_remove(struct i2c_client *client)
>   {
>   	struct sn65dsi83 *ctx = i2c_get_clientdata(client);
>   
> +	drm_bridge_remove(&ctx->bridge);
>   	of_node_put(ctx->host_node);
>   
>   	return 0;

Yes, the above is correct, thanks.

Reviewed-by: Marek Vasut <marex at denx.de>


More information about the dri-devel mailing list