Skip to content

Commit edb2c9d

Browse files
Wolfram SangWolfram Sang
authored andcommitted
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: 0560ad5 ("i2c: altera: Add Altera I2C Controller driver") Signed-off-by: Wolfram Sang <[email protected]> Reviewed-by: Thor Thayer <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent d79294d commit edb2c9d

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

drivers/i2c/busses/i2c-altera.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,6 @@ static int altr_i2c_probe(struct platform_device *pdev)
384384
struct altr_i2c_dev *idev = NULL;
385385
struct resource *res;
386386
int irq, ret;
387-
u32 val;
388387

389388
idev = devm_kzalloc(&pdev->dev, sizeof(*idev), GFP_KERNEL);
390389
if (!idev)
@@ -411,17 +410,17 @@ static int altr_i2c_probe(struct platform_device *pdev)
411410
init_completion(&idev->msg_complete);
412411
spin_lock_init(&idev->lock);
413412

414-
val = device_property_read_u32(idev->dev, "fifo-size",
413+
ret = device_property_read_u32(idev->dev, "fifo-size",
415414
&idev->fifo_size);
416-
if (val) {
415+
if (ret) {
417416
dev_err(&pdev->dev, "FIFO size set to default of %d\n",
418417
ALTR_I2C_DFLT_FIFO_SZ);
419418
idev->fifo_size = ALTR_I2C_DFLT_FIFO_SZ;
420419
}
421420

422-
val = device_property_read_u32(idev->dev, "clock-frequency",
421+
ret = device_property_read_u32(idev->dev, "clock-frequency",
423422
&idev->bus_clk_rate);
424-
if (val) {
423+
if (ret) {
425424
dev_err(&pdev->dev, "Default to 100kHz\n");
426425
idev->bus_clk_rate = I2C_MAX_STANDARD_MODE_FREQ; /* default clock rate */
427426
}

0 commit comments

Comments
 (0)