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

Commit eb8173e3 authored by Axel Lin's avatar Axel Lin Committed by Wolfram Sang
Browse files

i2c: jz4780: Fix return value if probe fails 



Current code returns 0 if fails to read clock-frequency DT property,
fix it. Also add checking return value of clk_prepare_enable and
propagate return value of devm_request_irq.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 72494810

drivers/i2c/busses/i2c-jz4780.c

+8 −7
Original line number Original line Diff line number Diff line
@@ -764,12 +764,15 @@ static int jz4780_i2c_probe(struct platform_device *pdev) 
	if (IS_ERR(i2c->clk))

	if (IS_ERR(i2c->clk))

		return PTR_ERR(i2c->clk);

		return PTR_ERR(i2c->clk);





	clk_prepare_enable(i2c->clk);

	ret = clk_prepare_enable(i2c->clk);

	if (ret)

		return ret;





	if (of_property_read_u32(pdev->dev.of_node, "clock-frequency",

	ret = of_property_read_u32(pdev->dev.of_node, "clock-frequency",

				 &clk_freq)) {

				   &clk_freq);

	if (ret) {

		dev_err(&pdev->dev, "clock-frequency not specified in DT");

		dev_err(&pdev->dev, "clock-frequency not specified in DT");

		return clk_freq;

		goto err;

	}

	}





	i2c->speed = clk_freq / 1000;

	i2c->speed = clk_freq / 1000;
@@ -790,10 +793,8 @@ static int jz4780_i2c_probe(struct platform_device *pdev) 
	i2c->irq = platform_get_irq(pdev, 0);

	i2c->irq = platform_get_irq(pdev, 0);

	ret = devm_request_irq(&pdev->dev, i2c->irq, jz4780_i2c_irq, 0,

	ret = devm_request_irq(&pdev->dev, i2c->irq, jz4780_i2c_irq, 0,

			       dev_name(&pdev->dev), i2c);

			       dev_name(&pdev->dev), i2c);

	if (ret) {

	if (ret)

		ret = -ENODEV;

		goto err;

		goto err;

	}





	ret = i2c_add_adapter(&i2c->adap);

	ret = i2c_add_adapter(&i2c->adap);

	if (ret < 0) {

	if (ret < 0) {