Re: [PATCH 08/31] spi: spi-qcom-qspi: fix potential mem leak in spi_geni_probe()

2021-01-04 Thread Mark Brown
On Fri, Jan 01, 2021 at 04:54:44PM +, Yangtao Li wrote:
> We should use dev_pm_opp_put_clkname() to free opp table each time
> dev_pm_opp_of_add_table() got error.

Acked-by: Mark Brown 


signature.asc
Description: PGP signature


[PATCH 08/31] spi: spi-qcom-qspi: fix potential mem leak in spi_geni_probe()

2021-01-01 Thread Yangtao Li
We should use dev_pm_opp_put_clkname() to free opp table each time
dev_pm_opp_of_add_table() got error.

Signed-off-by: Yangtao Li 
---
 drivers/spi/spi-geni-qcom.c | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c
index 512e925d5ea4..2b5a164fecb9 100644
--- a/drivers/spi/spi-geni-qcom.c
+++ b/drivers/spi/spi-geni-qcom.c
@@ -620,9 +620,12 @@ static int spi_geni_probe(struct platform_device *pdev)
return PTR_ERR(mas->se.opp_table);
/* OPP table is optional */
ret = dev_pm_opp_of_add_table(>dev);
-   if (ret && ret != -ENODEV) {
-   dev_err(>dev, "invalid OPP table in device tree\n");
-   goto put_clkname;
+   if (ret) {
+   dev_pm_opp_put_clkname(mas->se.opp_table);
+   if (ret != -ENODEV) {
+   dev_err(>dev, "invalid OPP table in device 
tree\n");
+   return ret;
+   }
}
 
spi->bus_num = -1;
@@ -675,7 +678,6 @@ static int spi_geni_probe(struct platform_device *pdev)
 spi_geni_probe_runtime_disable:
pm_runtime_disable(dev);
dev_pm_opp_of_remove_table(>dev);
-put_clkname:
dev_pm_opp_put_clkname(mas->se.opp_table);
return ret;
 }
-- 
2.25.1