drm_bridge_clear_and_put() is simpler to write and it prevents any
potential future use-after-free.

Reviewed-by: Osama Abdelkader <[email protected]>
Signed-off-by: Luca Ceresoli <[email protected]>
---
 drivers/gpu/drm/bridge/samsung-dsim.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c 
b/drivers/gpu/drm/bridge/samsung-dsim.c
index ec632f268644..c3eb437ef1b0 100644
--- a/drivers/gpu/drm/bridge/samsung-dsim.c
+++ b/drivers/gpu/drm/bridge/samsung-dsim.c
@@ -1988,9 +1988,7 @@ static int samsung_dsim_host_attach(struct mipi_dsi_host 
*host,
        return 0;
 
 err_release_next_bridge:
-       drm_bridge_put(dsi->bridge.next_bridge);
-       dsi->bridge.next_bridge = NULL;
-
+       drm_bridge_clear_and_put(&dsi->bridge.next_bridge);
        if (!(device->mode_flags & MIPI_DSI_MODE_VIDEO))
                samsung_dsim_unregister_te_irq(dsi);
 err_remove_bridge:
@@ -2007,8 +2005,7 @@ static int samsung_dsim_host_detach(struct mipi_dsi_host 
*host,
        if (pdata->host_ops && pdata->host_ops->detach)
                pdata->host_ops->detach(dsi, device);
 
-       drm_bridge_put(dsi->bridge.next_bridge);
-       dsi->bridge.next_bridge = NULL;
+       drm_bridge_clear_and_put(&dsi->bridge.next_bridge);
 
        samsung_dsim_unregister_te_irq(dsi);
 

-- 
2.53.0

Reply via email to