Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc209ac8 authored by Franklin S Cooper Jr's avatar Franklin S Cooper Jr Committed by Wolfram Sang
Browse files

i2c: davinci: Preserve return value of devm_clk_get 



The i2c driver can run into driver dependency issues if its loaded
before a clock driver it depends on. Therefore, EPROBE_DEFER may be
returned by devm_clk_get and should be returned in probe to allow the
kernel to reprobe the driver at a later time. This patch allows the error
value returned by devm_clk_get to be passed through and not overwritten.

Signed-off-by: default avatarFranklin S Cooper Jr <fcooper@ti.com>
Reviewed-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Acked-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 1304fe09

drivers/i2c/busses/i2c-davinci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -801,7 +801,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) 




	dev->clk = devm_clk_get(&pdev->dev, NULL);

	dev->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(dev->clk))

	if (IS_ERR(dev->clk))

		return -ENODEV;

		return PTR_ERR(dev->clk);

	clk_prepare_enable(dev->clk);

	clk_prepare_enable(dev->clk);





	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);