* [PATCH -next v2 1/2] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe()
@ 2022-05-14 2:31 Yang Yingliang
2022-05-14 2:31 ` [PATCH -next v2 2/2] i2c: mt7621: Use devm_platform_get_and_ioremap_resource() Yang Yingliang
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Yang Yingliang @ 2022-05-14 2:31 UTC (permalink / raw)
To: linux-kernel, linux-mediatek, linux-arm-kernel, linux-i2c
Cc: matthias.bgg, sr, wsa, christophe.jaillet
Fix the missing clk_disable_unprepare() before return
from mtk_i2c_probe() in the error handling case.
Fixes: d04913ec5f89 ("i2c: mt7621: Add MediaTek MT7621/7628/7688 I2C driver")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
v2: add return 0 in normal path.
---
drivers/i2c/busses/i2c-mt7621.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-mt7621.c b/drivers/i2c/busses/i2c-mt7621.c
index 45fe4a7fe0c0..901f0fb04fee 100644
--- a/drivers/i2c/busses/i2c-mt7621.c
+++ b/drivers/i2c/busses/i2c-mt7621.c
@@ -304,7 +304,8 @@ static int mtk_i2c_probe(struct platform_device *pdev)
if (i2c->bus_freq == 0) {
dev_warn(i2c->dev, "clock-frequency 0 not supported\n");
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_disable_clk;
}
adap = &i2c->adap;
@@ -322,10 +323,15 @@ static int mtk_i2c_probe(struct platform_device *pdev)
ret = i2c_add_adapter(adap);
if (ret < 0)
- return ret;
+ goto err_disable_clk;
dev_info(&pdev->dev, "clock %u kHz\n", i2c->bus_freq / 1000);
+ return 0;
+
+err_disable_clk:
+ clk_disable_unprepare(i2c->clk);
+
return ret;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH -next v2 2/2] i2c: mt7621: Use devm_platform_get_and_ioremap_resource()
2022-05-14 2:31 [PATCH -next v2 1/2] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe() Yang Yingliang
@ 2022-05-14 2:31 ` Yang Yingliang
2022-05-21 10:13 ` Wolfram Sang
2022-05-16 6:26 ` [PATCH -next v2 1/2] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe() Stefan Roese
2022-05-21 10:12 ` Wolfram Sang
2 siblings, 1 reply; 5+ messages in thread
From: Yang Yingliang @ 2022-05-14 2:31 UTC (permalink / raw)
To: linux-kernel, linux-mediatek, linux-arm-kernel, linux-i2c
Cc: matthias.bgg, sr, wsa, christophe.jaillet
Use devm_platform_get_and_ioremap_resource() to simplify
code.
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Stefan Roese <sr@denx.de>
---
drivers/i2c/busses/i2c-mt7621.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-mt7621.c b/drivers/i2c/busses/i2c-mt7621.c
index 901f0fb04fee..cfe6de8175dd 100644
--- a/drivers/i2c/busses/i2c-mt7621.c
+++ b/drivers/i2c/busses/i2c-mt7621.c
@@ -270,18 +270,15 @@ static void mtk_i2c_init(struct mtk_i2c *i2c)
static int mtk_i2c_probe(struct platform_device *pdev)
{
- struct resource *res;
struct mtk_i2c *i2c;
struct i2c_adapter *adap;
int ret;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
i2c = devm_kzalloc(&pdev->dev, sizeof(struct mtk_i2c), GFP_KERNEL);
if (!i2c)
return -ENOMEM;
- i2c->base = devm_ioremap_resource(&pdev->dev, res);
+ i2c->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
if (IS_ERR(i2c->base))
return PTR_ERR(i2c->base);
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH -next v2 2/2] i2c: mt7621: Use devm_platform_get_and_ioremap_resource()
2022-05-14 2:31 ` [PATCH -next v2 2/2] i2c: mt7621: Use devm_platform_get_and_ioremap_resource() Yang Yingliang
@ 2022-05-21 10:13 ` Wolfram Sang
0 siblings, 0 replies; 5+ messages in thread
From: Wolfram Sang @ 2022-05-21 10:13 UTC (permalink / raw)
To: Yang Yingliang
Cc: linux-kernel, linux-mediatek, linux-arm-kernel, linux-i2c,
matthias.bgg, sr, christophe.jaillet
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
On Sat, May 14, 2022 at 10:31:48AM +0800, Yang Yingliang wrote:
> Use devm_platform_get_and_ioremap_resource() to simplify
> code.
>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> Reviewed-by: Stefan Roese <sr@denx.de>
Applied to for-next, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH -next v2 1/2] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe()
2022-05-14 2:31 [PATCH -next v2 1/2] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe() Yang Yingliang
2022-05-14 2:31 ` [PATCH -next v2 2/2] i2c: mt7621: Use devm_platform_get_and_ioremap_resource() Yang Yingliang
@ 2022-05-16 6:26 ` Stefan Roese
2022-05-21 10:12 ` Wolfram Sang
2 siblings, 0 replies; 5+ messages in thread
From: Stefan Roese @ 2022-05-16 6:26 UTC (permalink / raw)
To: Yang Yingliang, linux-kernel, linux-mediatek, linux-arm-kernel,
linux-i2c
Cc: matthias.bgg, wsa, christophe.jaillet
On 14.05.22 04:31, Yang Yingliang wrote:
> Fix the missing clk_disable_unprepare() before return
> from mtk_i2c_probe() in the error handling case.
>
> Fixes: d04913ec5f89 ("i2c: mt7621: Add MediaTek MT7621/7628/7688 I2C driver")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> v2: add return 0 in normal path.
> ---
> drivers/i2c/busses/i2c-mt7621.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-mt7621.c b/drivers/i2c/busses/i2c-mt7621.c
> index 45fe4a7fe0c0..901f0fb04fee 100644
> --- a/drivers/i2c/busses/i2c-mt7621.c
> +++ b/drivers/i2c/busses/i2c-mt7621.c
> @@ -304,7 +304,8 @@ static int mtk_i2c_probe(struct platform_device *pdev)
>
> if (i2c->bus_freq == 0) {
> dev_warn(i2c->dev, "clock-frequency 0 not supported\n");
> - return -EINVAL;
> + ret = -EINVAL;
> + goto err_disable_clk;
> }
>
> adap = &i2c->adap;
> @@ -322,10 +323,15 @@ static int mtk_i2c_probe(struct platform_device *pdev)
>
> ret = i2c_add_adapter(adap);
> if (ret < 0)
> - return ret;
> + goto err_disable_clk;
>
> dev_info(&pdev->dev, "clock %u kHz\n", i2c->bus_freq / 1000);
>
> + return 0;
> +
> +err_disable_clk:
> + clk_disable_unprepare(i2c->clk);
> +
> return ret;
> }
>
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH -next v2 1/2] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe()
2022-05-14 2:31 [PATCH -next v2 1/2] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe() Yang Yingliang
2022-05-14 2:31 ` [PATCH -next v2 2/2] i2c: mt7621: Use devm_platform_get_and_ioremap_resource() Yang Yingliang
2022-05-16 6:26 ` [PATCH -next v2 1/2] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe() Stefan Roese
@ 2022-05-21 10:12 ` Wolfram Sang
2 siblings, 0 replies; 5+ messages in thread
From: Wolfram Sang @ 2022-05-21 10:12 UTC (permalink / raw)
To: Yang Yingliang
Cc: linux-kernel, linux-mediatek, linux-arm-kernel, linux-i2c,
matthias.bgg, sr, christophe.jaillet
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
On Sat, May 14, 2022 at 10:31:47AM +0800, Yang Yingliang wrote:
> Fix the missing clk_disable_unprepare() before return
> from mtk_i2c_probe() in the error handling case.
>
> Fixes: d04913ec5f89 ("i2c: mt7621: Add MediaTek MT7621/7628/7688 I2C driver")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Applied to for-current, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-21 10:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-14 2:31 [PATCH -next v2 1/2] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe() Yang Yingliang
2022-05-14 2:31 ` [PATCH -next v2 2/2] i2c: mt7621: Use devm_platform_get_and_ioremap_resource() Yang Yingliang
2022-05-21 10:13 ` Wolfram Sang
2022-05-16 6:26 ` [PATCH -next v2 1/2] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe() Stefan Roese
2022-05-21 10:12 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).