TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtk-svs:

Browse Source 
* Drop reference taken on probe failure
 -----BEGIN PGP SIGNATURE-----
 
 iQJPBAABCAA5FiEEUdvKHhzqrUYPB/u8L21+TfbCqH4FAmjBVsobFIAAAAAABAAO
 bWFudTIsMi41KzEuMTEsMiwyAAoJEC9tfk32wqh+aZoQAI/mG+jHtKccR8oDz8CO
 QRXWtE9/jjOiL0kSs0xT0c0BRGpINcvu9wmC8GGvSu6M9siwV8lj+g7GgMA97ljL
 YVdMX8JkpFTPIHTJmqH2u3VePbC/Hatngr8a6BnEjgjrvWRw1xvAwcL/aN7P+/VT
 +GzkBapMIBmFbP1txjm7ecfCzlBd4/vzmue4eiR4+8IciWuRoigqlPME2pACA4qH
 4l80GSt3JYRp4GCV9XuZCFDpQ4/A8Fg2HBswSzaqLE4WN2ztJk9POWxiWuPPmwUn
 1C1WizlUNzaDzsQEWgWVsarwjTB5g62DbApgMtDfh0OpApfEFjsgX4vVO3m03CBS
 F69XitW17FJW07iiBM2BzSa5X7JdDonmsoyQZLgp6bnDQqkHtn2lXjWX+a5/X1s+
 e10gGs5/3SjRkP1PJcaII3UvAbxLFXn28qgfFCHg/rqY0BHY5ZeXz07W9jfV8jKh
 9u5AZtYscsqhlarQU/kUgcG2rmqXXocqkj9aixjMlN2FsyCXkqIjqN6jeRtlZFIt
 PqLdohr/tP0F3Jf7Kx15BGgCQGSQEPiWtlaNcTlpanoIW7t8Mu/lfIocEAjHHvPu
 R19b6I5SofdC83ToEpNmUXx9WU23LKbxasjKT/7GoqOfZTX+EhHuC+z4jQ073Yoh
 Kux1s/9RXgm89VYicj44ApVn
 =CZrV
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmjIJgQACgkQmmx57+YA
 GNkQLhAAgT+C93puuq6LND/uXAKXKoK80S68stvYV0t7iDju64imNP0TRT2rIJWX
 QiZ+eG8bG42tdAg99sFV3Y0TGp4AxZGPMD0LbFNxvyOVgciTbPFoQAFRbfUfNTOv
 Lj3oyMTL2QZCnbAINezB13sIcrMtSOBTaflziNq9trvXiHkngvuZGa6GtfWrKR+V
 8Adis72LERvhOd9bS4nIOSnGCTk+h7iUuBVMiZEi4LyGP+9VgOCi0QQR1tvu8I6f
 pSKOU8P3Bny5OKl9tDKUegIT1qV0j06MAgMadEJ5D0RNsAkDG3TlImbbRrN1K+cL
 ldbdQHBCcQoSzpF+S+QM3Ni3FuhFgiNOJTwnESSCVP9JcPfL3TlkQgvPpjFTzWEr
 pIgHSWQYXJ0qFwQ9/whKR02sUp9YJbWZ8WzmnD+/vUjXZTXYwGY8wEWtJymlN3Lu
 0gDAzko02FMZSuUJbPV3aiO9qc7FcToIqOC4NA5Z3JSrfKYqo8V2N3UWypF9Mr82
 KSUkedDAr8S4dWEcKUDdhLnqofiobg1/xsEUIKvewOY49JZJBelNSjaJGTX9ZvZp
 0/0/xQLWd9kE8u3ZMsgtChsX/NGwb8nn6muhoIlUflS0Era4et6QgWrUKbPiM0wD
 8LtDFww3LkkQxVVNbQJDMdCvvEFXNQcPmJkrZu11mtqXo8TBnW8=
 =xMmo
 -----END PGP SIGNATURE-----

Merge tag 'v6.17-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into soc/drivers

mtk-svs:
* Drop reference taken on probe failure

* tag 'v6.17-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux:
  soc: mediatek: mtk-svs: fix device leaks on mt8192 probe failure
  soc: mediatek: mtk-svs: fix device leaks on mt8183 probe failure

Link: https://lore.kernel.org/r/87c8f50b-90a5-47ed-af60-99a4e075a266@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-09-15 16:43:10 +02:00
commit 9674bc8805
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/soc/mediatek/mtk-svs.c
View File

@ -2165,10 +2165,18 @@ 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;
u32 idx;
int ret;
svsp->rst = devm_reset_control_get_optional(svsp->dev, "svs_rst");
if (IS_ERR(svsp->rst))
@ -2179,6 +2187,7 @@ static int svs_mt8192_platform_probe(struct svs_platform *svsp)
if (IS_ERR(dev))
return dev_err_probe(svsp->dev, PTR_ERR(dev),
"failed to get lvts device\n");
put_device(dev);
for (idx = 0; idx < svsp->bank_max; idx++) {
struct svs_bank *svsb = &svsp->banks[idx];
@ -2188,6 +2197,7 @@ static int svs_mt8192_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");
@ -2207,6 +2217,11 @@ static int svs_mt8192_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;
@ -2216,11 +2231,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 +2247,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 +2264,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;