android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2c: qup: Add missing unwind goto in qup_i2c_probe()

Browse Source 
commit cd9489623c29aa2f8cc07088168afb6e0d5ef06d upstream.

Smatch Warns:
	drivers/i2c/busses/i2c-qup.c:1784 qup_i2c_probe()
	warn: missing unwind goto?

The goto label "fail_runtime" and "fail" will disable qup->pclk,
but here qup->pclk failed to obtain, in order to be consistent,
change the direct return to goto label "fail_dma".

Fixes: 9cedf3b2f0 ("i2c: qup: Add bam dma capabilities")
Signed-off-by: Shuai Jiang <d202180596@hust.edu.cn>
Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Cc: <stable@vger.kernel.org> # v4.6+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Shuai Jiang 2023-04-18 21:56:12 +08:00 committed by Greg Kroah-Hartman
parent e41a8e4615
commit 8d36cb6d1a
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/i2c/busses/i2c-qup.c
View File

@ -1752,16 +1752,21 @@ static int qup_i2c_probe(struct platform_device *pdev)
if (!clk_freq || clk_freq > I2C_MAX_FAST_MODE_PLUS_FREQ) { if (!clk_freq || clk_freq > I2C_MAX_FAST_MODE_PLUS_FREQ) {
dev_err(qup->dev, "clock frequency not supported %d\n", dev_err(qup->dev, "clock frequency not supported %d\n",
clk_freq); clk_freq);
return -EINVAL; ret = -EINVAL;
goto fail_dma;
} }
qup->base = devm_platform_ioremap_resource(pdev, 0); qup->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(qup->base)) if (IS_ERR(qup->base)) {
return PTR_ERR(qup->base); ret = PTR_ERR(qup->base);
goto fail_dma;
}
qup->irq = platform_get_irq(pdev, 0); qup->irq = platform_get_irq(pdev, 0);
if (qup->irq < 0) if (qup->irq < 0) {
return qup->irq; ret = qup->irq;
goto fail_dma;
}
if (has_acpi_companion(qup->dev)) { if (has_acpi_companion(qup->dev)) {
ret = device_property_read_u32(qup->dev, ret = device_property_read_u32(qup->dev,
@ -1775,13 +1780,15 @@ static int qup_i2c_probe(struct platform_device *pdev)
qup->clk = devm_clk_get(qup->dev, "core"); qup->clk = devm_clk_get(qup->dev, "core");
if (IS_ERR(qup->clk)) { if (IS_ERR(qup->clk)) {
dev_err(qup->dev, "Could not get core clock\n"); dev_err(qup->dev, "Could not get core clock\n");
return PTR_ERR(qup->clk); ret = PTR_ERR(qup->clk);
goto fail_dma;
} }
qup->pclk = devm_clk_get(qup->dev, "iface"); qup->pclk = devm_clk_get(qup->dev, "iface");
if (IS_ERR(qup->pclk)) { if (IS_ERR(qup->pclk)) {
dev_err(qup->dev, "Could not get iface clock\n"); dev_err(qup->dev, "Could not get iface clock\n");
return PTR_ERR(qup->pclk); ret = PTR_ERR(qup->pclk);
goto fail_dma;
} }
qup_i2c_enable_clocks(qup); qup_i2c_enable_clocks(qup);
src_clk_freq = clk_get_rate(qup->clk); src_clk_freq = clk_get_rate(qup->clk);