shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: i2c: qcom-geni: fix missing clk_disable_unprepare() and geni_se_resources_off()

Browse Source 
Add missing clk_disable_unprepare() and geni_se_resources_off() in the error
path in geni_i2c_probe().

Fixes: 14d02fbadb ("i2c: qcom-geni: add desc struct to prepare support for I2C Master Hub variant")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

Bug: 370629635
Change-Id: I914d5fa381478dfe0dbcf98b1245b411e5a4a84a
(cherry picked from commit 043465b66506e8c647cdd38a2db1f2ee0f369a1b)
Signed-off-by: Praveen Talari <quic_ptalari@quicinc.com>
This commit is contained in:
Yang Yingliang
2023-11-30 09:43:24 +08:00
committed by John Stultz
parent 8fd3f0784d
commit fa329140c1
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/i2c/busses/i2c-qcom-geni.c
View File

@@ -857,6 +857,7 @@ static int geni_i2c_probe(struct platform_device *pdev)
ret = geni_se_resources_on(&gi2c->se); ret = geni_se_resources_on(&gi2c->se);
if (ret) { if (ret) {
dev_err(dev, "Error turning on resources %d\n", ret); dev_err(dev, "Error turning on resources %d\n", ret);
clk_disable_unprepare(gi2c->core_clk);
return ret; return ret;
} }
proto = geni_se_read_proto(&gi2c->se); proto = geni_se_read_proto(&gi2c->se);
@@ -876,8 +877,11 @@ static int geni_i2c_probe(struct platform_device *pdev)
/* FIFO is disabled, so we can only use GPI DMA */ /* FIFO is disabled, so we can only use GPI DMA */
gi2c->gpi_mode = true; gi2c->gpi_mode = true;
ret = setup_gpi_dma(gi2c); ret = setup_gpi_dma(gi2c);
if (ret) if (ret) {
geni_se_resources_off(&gi2c->se);
clk_disable_unprepare(gi2c->core_clk);
return dev_err_probe(dev, ret, "Failed to setup GPI DMA mode\n"); return dev_err_probe(dev, ret, "Failed to setup GPI DMA mode\n");
}
dev_dbg(dev, "Using GPI DMA mode for I2C\n"); dev_dbg(dev, "Using GPI DMA mode for I2C\n");
} else { } else {
@@ -890,6 +894,8 @@ static int geni_i2c_probe(struct platform_device *pdev)
if (!tx_depth) { if (!tx_depth) {
dev_err(dev, "Invalid TX FIFO depth\n"); dev_err(dev, "Invalid TX FIFO depth\n");
geni_se_resources_off(&gi2c->se);
clk_disable_unprepare(gi2c->core_clk);
return -EINVAL; return -EINVAL;
} }