| Message ID | 1474622126-1996-1-git-send-email-khoroshilov@ispras.ru |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Sep 23, 2016 at 11:15:26AM +0200, Alexey Khoroshilov wrote: > 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 <khoroshilov@ispras.ru> Applied to for-next, thanks! Please use "V2" in subject (git has a '-v<n>' parameter for that) and provide a changelog below "---" next time. Also, try to add the driver author or recently active people on that driver so we can have tests on HW.
diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c index d3bcaf4..4351a93 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)
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 <khoroshilov@ispras.ru> --- drivers/i2c/busses/i2c-axxia.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)