From 662786a5429c3a992c6f884a647ee32424822358 Mon Sep 17 00:00:00 2001 From: Alexey Khoroshilov Date: Fri, 23 Sep 2016 11:15:26 +0200 Subject: i2c: axxia: disable clks in case of failure in probe axxia_i2c_probe() does not disable clock in case of failure in i2c_add_adapter(). Also it ignores returned value from clk_prepare_enable(). Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-axxia.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c index d3bcaf4ab095..4351a9343058 100644 --- a/drivers/i2c/busses/i2c-axxia.c +++ b/drivers/i2c/busses/i2c-axxia.c @@ -545,7 +545,11 @@ static int axxia_i2c_probe(struct platform_device *pdev) return ret; } - clk_prepare_enable(idev->i2c_clk); + ret = clk_prepare_enable(idev->i2c_clk); + if (ret) { + dev_err(&pdev->dev, "failed to enable clock\n"); + return ret; + } i2c_set_adapdata(&idev->adapter, idev); strlcpy(idev->adapter.name, pdev->name, sizeof(idev->adapter.name)); @@ -558,7 +562,13 @@ static int axxia_i2c_probe(struct platform_device *pdev) platform_set_drvdata(pdev, idev); - return i2c_add_adapter(&idev->adapter); + ret = i2c_add_adapter(&idev->adapter); + if (ret) { + clk_disable_unprepare(idev->i2c_clk); + return ret; + } + + return 0; } static int axxia_i2c_remove(struct platform_device *pdev) -- cgit v1.2.3