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

Commit 79b44995 authored by Fabrice Gasnier's avatar Fabrice Gasnier Committed by Wolfram Sang
Browse files

i2c: stm32f7: fix the get_irq error cases 



During probe, return the "get_irq" error value instead of -EINVAL which
allows the driver to be deferred probed if needed.
Fix also the case where of_irq_get() returns a negative value.
Note :
On failure of_irq_get() returns 0 or a negative value while
platform_get_irq() returns a negative value.

Fixes: aeb068c5 ("i2c: i2c-stm32f7: add driver")
Reviewed-by: default avatarPierre-Yves MORDRET <pierre-yves.mordret@st.com>
Signed-off-by: default avatarFabien Dessenne <fabien.dessenne@st.com>
Signed-off-by: default avatarFabrice Gasnier <fabrice.gasnier@st.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent af668d65

drivers/i2c/busses/i2c-stm32f7.c

+14 −12
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/pinctrl/consumer.h>
@@ -1816,15 +1815,14 @@ static struct i2c_algorithm stm32f7_i2c_algo = { 


static int stm32f7_i2c_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct stm32f7_i2c_dev *i2c_dev;

	const struct stm32f7_i2c_setup *setup;

	struct resource *res;

	u32 irq_error, irq_event, clk_rate, rise_time, fall_time;

	u32 clk_rate, rise_time, fall_time;

	struct i2c_adapter *adap;

	struct reset_control *rst;

	dma_addr_t phy_addr;

	int ret;

	int irq_error, irq_event, ret;



	i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);

	if (!i2c_dev)
@@ -1836,16 +1834,20 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) 
		return PTR_ERR(i2c_dev->base);

	phy_addr = (dma_addr_t)res->start;



	irq_event = irq_of_parse_and_map(np, 0);

	if (!irq_event) {

		dev_err(&pdev->dev, "IRQ event missing or invalid\n");

		return -EINVAL;

	irq_event = platform_get_irq(pdev, 0);

	if (irq_event <= 0) {

		if (irq_event != -EPROBE_DEFER)

			dev_err(&pdev->dev, "Failed to get IRQ event: %d\n",

				irq_event);

		return irq_event ? : -ENOENT;

	}



	irq_error = irq_of_parse_and_map(np, 1);

	if (!irq_error) {

		dev_err(&pdev->dev, "IRQ error missing or invalid\n");

		return -EINVAL;

	irq_error = platform_get_irq(pdev, 1);

	if (irq_error <= 0) {

		if (irq_error != -EPROBE_DEFER)

			dev_err(&pdev->dev, "Failed to get IRQ error: %d\n",

				irq_error);

		return irq_error ? : -ENOENT;

	}



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