public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

i2c: axxia: disable clks in case of failure in probe

Browse source 
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>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Alexey Khoroshilov 2016-09-23 11:15:26 +02:00 • committed by Wolfram Sang
parent 70121f7f37
commit 662786a542
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/i2c/busses/i2c-axxia.c
View file

@ -545,7 +545,11 @@ static int axxia_i2c_probe(struct platform_device *pdev)
return ret; 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); i2c_set_adapdata(&idev->adapter, idev);
strlcpy(idev->adapter.name, pdev->name, sizeof(idev->adapter.name)); 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); 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) static int axxia_i2c_remove(struct platform_device *pdev)