提交 159f5664 编写于 作者: W Wei Yongjun 提交者: Zheng Zengkai

spi: omap-100k: Fix reference leak to master

stable inclusion
from stable-5.10.36
commit 75e2b46211374fc2d254babe6f41bda6bfc7a1f9
bugzilla: 51867
CVE: NA

--------------------------------

[ Upstream commit a23faea7 ]

Call spi_master_get() holds the reference count to master device, thus
we need an additional spi_master_put() call to reduce the reference
count, otherwise we will leak a reference to master.

This commit fix it by removing the unnecessary spi_master_get().
Reported-by: NHulk Robot <hulkci@huawei.com>
Signed-off-by: NWei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20210409082954.2906933-1-weiyongjun1@huawei.comSigned-off-by: NMark Brown <broonie@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 f06c49ba
...@@ -424,7 +424,7 @@ static int omap1_spi100k_probe(struct platform_device *pdev) ...@@ -424,7 +424,7 @@ static int omap1_spi100k_probe(struct platform_device *pdev)
static int omap1_spi100k_remove(struct platform_device *pdev) static int omap1_spi100k_remove(struct platform_device *pdev)
{ {
struct spi_master *master = spi_master_get(platform_get_drvdata(pdev)); struct spi_master *master = platform_get_drvdata(pdev);
struct omap1_spi100k *spi100k = spi_master_get_devdata(master); struct omap1_spi100k *spi100k = spi_master_get_devdata(master);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
...@@ -438,7 +438,7 @@ static int omap1_spi100k_remove(struct platform_device *pdev) ...@@ -438,7 +438,7 @@ static int omap1_spi100k_remove(struct platform_device *pdev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int omap1_spi100k_runtime_suspend(struct device *dev) static int omap1_spi100k_runtime_suspend(struct device *dev)
{ {
struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); struct spi_master *master = dev_get_drvdata(dev);
struct omap1_spi100k *spi100k = spi_master_get_devdata(master); struct omap1_spi100k *spi100k = spi_master_get_devdata(master);
clk_disable_unprepare(spi100k->ick); clk_disable_unprepare(spi100k->ick);
...@@ -449,7 +449,7 @@ static int omap1_spi100k_runtime_suspend(struct device *dev) ...@@ -449,7 +449,7 @@ static int omap1_spi100k_runtime_suspend(struct device *dev)
static int omap1_spi100k_runtime_resume(struct device *dev) static int omap1_spi100k_runtime_resume(struct device *dev)
{ {
struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); struct spi_master *master = dev_get_drvdata(dev);
struct omap1_spi100k *spi100k = spi_master_get_devdata(master); struct omap1_spi100k *spi100k = spi_master_get_devdata(master);
int ret; int ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册