]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
soc: mediatek: mtk-svs: fix device leaks on mt8183 probe failure
authorJohan Hovold <johan@kernel.org>
Tue, 9 Sep 2025 09:56:50 +0000 (11:56 +0200)
committerMatthias Brugger <matthias.bgg@gmail.com>
Wed, 10 Sep 2025 09:48:56 +0000 (11:48 +0200)
Make sure to drop the references taken by of_find_device_by_node() when
looking up the thermal sensor and opp devices during probe on probe
failure (e.g. probe deferral) and on driver unbind.

Fixes: 681a02e95000 ("soc: mediatek: SVS: introduce MTK SVS engine")
Cc: Roger Lu <roger.lu@mediatek.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20250909095651.5530-2-johan@kernel.org
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
drivers/soc/mediatek/mtk-svs.c

index 7c349a94b45c0378fe4ee582eb4eed807293d12d..48804e1e5a6c81f4fd1d43442c66ea0d671abc0a 100644 (file)
@@ -2165,6 +2165,13 @@ static struct device *svs_add_device_link(struct svs_platform *svsp,
        return dev;
 }
 
+static void svs_put_device(void *_dev)
+{
+       struct device *dev = _dev;
+
+       put_device(dev);
+}
+
 static int svs_mt8192_platform_probe(struct svs_platform *svsp)
 {
        struct device *dev;
@@ -2216,11 +2223,13 @@ static int svs_mt8183_platform_probe(struct svs_platform *svsp)
 {
        struct device *dev;
        u32 idx;
+       int ret;
 
        dev = svs_add_device_link(svsp, "thermal-sensor");
        if (IS_ERR(dev))
                return dev_err_probe(svsp->dev, PTR_ERR(dev),
                                     "failed to get thermal device\n");
+       put_device(dev);
 
        for (idx = 0; idx < svsp->bank_max; idx++) {
                struct svs_bank *svsb = &svsp->banks[idx];
@@ -2230,6 +2239,7 @@ static int svs_mt8183_platform_probe(struct svs_platform *svsp)
                case SVSB_SWID_CPU_LITTLE:
                case SVSB_SWID_CPU_BIG:
                        svsb->opp_dev = get_cpu_device(bdata->cpu_id);
+                       get_device(svsb->opp_dev);
                        break;
                case SVSB_SWID_CCI:
                        svsb->opp_dev = svs_add_device_link(svsp, "cci");
@@ -2246,6 +2256,11 @@ static int svs_mt8183_platform_probe(struct svs_platform *svsp)
                        return dev_err_probe(svsp->dev, PTR_ERR(svsb->opp_dev),
                                             "failed to get OPP device for bank %d\n",
                                             idx);
+
+               ret = devm_add_action_or_reset(svsp->dev, svs_put_device,
+                                              svsb->opp_dev);
+               if (ret)
+                       return ret;
        }
 
        return 0;