This is an automatic generated email to let you know that the following patch 
were queued:

Subject: media: dvb-frontends: m88ds3103: Fix a memory leak in an error 
handling path of m88ds3103_probe()
Author:  Christophe JAILLET <christophe.jail...@wanadoo.fr>
Date:    Mon Oct 30 08:20:26 2023 +0100

If an error occurs after a successful i2c_mux_add_adapter(), then
i2c_mux_del_adapters() should be called to free some resources, as
already done in the remove function.

Fixes: e6089feca460 ("media: m88ds3103: Add support for ds3103b demod")
Signed-off-by: Christophe JAILLET <christophe.jail...@wanadoo.fr>
Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>

 drivers/media/dvb-frontends/m88ds3103.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

---

diff --git a/drivers/media/dvb-frontends/m88ds3103.c 
b/drivers/media/dvb-frontends/m88ds3103.c
index 26c67ef05d13..e0272054fca5 100644
--- a/drivers/media/dvb-frontends/m88ds3103.c
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -1894,7 +1894,7 @@ static int m88ds3103_probe(struct i2c_client *client)
                /* get frontend address */
                ret = regmap_read(dev->regmap, 0x29, &utmp);
                if (ret)
-                       goto err_kfree;
+                       goto err_del_adapters;
                dev->dt_addr = ((utmp & 0x80) == 0) ? 0x42 >> 1 : 0x40 >> 1;
                dev_dbg(&client->dev, "dt addr is 0x%02x\n", dev->dt_addr);
 
@@ -1902,11 +1902,14 @@ static int m88ds3103_probe(struct i2c_client *client)
                                                      dev->dt_addr);
                if (IS_ERR(dev->dt_client)) {
                        ret = PTR_ERR(dev->dt_client);
-                       goto err_kfree;
+                       goto err_del_adapters;
                }
        }
 
        return 0;
+
+err_del_adapters:
+       i2c_mux_del_adapters(dev->muxc);
 err_kfree:
        kfree(dev);
 err:

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to