]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm: bridge: adv7511: Remove redundant null check before clk_disable_unprepare
authorXu Wang <vulab@iscas.ac.cn>
Fri, 27 Nov 2020 09:18:29 +0000 (09:18 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 1 Feb 2025 17:22:25 +0000 (18:22 +0100)
[ Upstream commit 3fc5a284213d5fca1c0807ea8725355d39808930 ]

Because clk_disable_unprepare() already checked NULL clock parameter,
so the additional check is unnecessary, just remove them.

Signed-off-by: Xu Wang <vulab@iscas.ac.cn>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Stable-dep-of: 81adbd3ff21c ("drm: adv7511: Fix use-after-free in adv7533_attach_dsi()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

index e50c741cbfe7246ef42bdb28c85689ac7088ef48..60400efe1dd3800e379e40119101651043268d56 100644 (file)
@@ -1324,8 +1324,7 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
 err_unregister_cec:
        cec_unregister_adapter(adv7511->cec_adap);
        i2c_unregister_device(adv7511->i2c_cec);
-       if (adv7511->cec_clk)
-               clk_disable_unprepare(adv7511->cec_clk);
+       clk_disable_unprepare(adv7511->cec_clk);
 err_i2c_unregister_packet:
        i2c_unregister_device(adv7511->i2c_packet);
 err_i2c_unregister_edid:
@@ -1343,8 +1342,7 @@ static int adv7511_remove(struct i2c_client *i2c)
        if (adv7511->type == ADV7533 || adv7511->type == ADV7535)
                adv7533_detach_dsi(adv7511);
        i2c_unregister_device(adv7511->i2c_cec);
-       if (adv7511->cec_clk)
-               clk_disable_unprepare(adv7511->cec_clk);
+       clk_disable_unprepare(adv7511->cec_clk);
 
        adv7511_uninit_regulators(adv7511);