Commit edb2c9dd authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: altera: use proper variable to hold errno 



device_property_read_u32() returns errno or 0, so we should use the
integer variable 'ret' and not the u32 'val' to hold the retval.

Fixes: 0560ad57 ("i2c: altera: Add Altera I2C Controller driver")
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarThor Thayer <thor.thayer@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent d79294d0

drivers/i2c/busses/i2c-altera.c

+4 −5
Original line number Diff line number Diff line
@@ -384,7 +384,6 @@ static int altr_i2c_probe(struct platform_device *pdev) 
	struct altr_i2c_dev *idev = NULL;

	struct resource *res;

	int irq, ret;

	u32 val;



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

	if (!idev)
@@ -411,17 +410,17 @@ static int altr_i2c_probe(struct platform_device *pdev) 
	init_completion(&idev->msg_complete);

	spin_lock_init(&idev->lock);



	val = device_property_read_u32(idev->dev, "fifo-size",

	ret = device_property_read_u32(idev->dev, "fifo-size",

				       &idev->fifo_size);

	if (val) {

	if (ret) {

		dev_err(&pdev->dev, "FIFO size set to default of %d\n",

			ALTR_I2C_DFLT_FIFO_SZ);

		idev->fifo_size = ALTR_I2C_DFLT_FIFO_SZ;

	}



	val = device_property_read_u32(idev->dev, "clock-frequency",

	ret = device_property_read_u32(idev->dev, "clock-frequency",

				       &idev->bus_clk_rate);

	if (val) {

	if (ret) {

		dev_err(&pdev->dev, "Default to 100kHz\n");

		idev->bus_clk_rate = I2C_MAX_STANDARD_MODE_FREQ;	/* default clock rate */

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE