]> Pileus Git - ~andy/linux/commitdiff
i2c: sirf: retry 3 times as sometimes we get random noack and timeout
authorZhiwu Song <Zhiwu.Song@csr.com>
Tue, 13 Aug 2013 09:11:31 +0000 (17:11 +0800)
committerWolfram Sang <wsa@the-dreams.de>
Wed, 28 Aug 2013 09:46:03 +0000 (11:46 +0200)
let i2c core retry 3 times as sometimes we get random noack and timeout
even when we access an existing i2c client.

Signed-off-by: Zhiwu Song <Zhiwu.Song@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-sirf.c

index 30ae3780b7bfba99ae76319dc3d8f11de6cea3ab..6784f7f527a432396c1ff49faca4382a81a2fc4d 100644 (file)
@@ -229,7 +229,7 @@ static int i2c_sirfsoc_xfer_msg(struct sirfsoc_i2c *siic, struct i2c_msg *msg)
                while (readl(siic->base + SIRFSOC_I2C_CTRL) & SIRFSOC_I2C_RESET)
                        cpu_relax();
        }
-       return siic->err_status ? -EIO : 0;
+       return siic->err_status ? -EAGAIN : 0;
 }
 
 static u32 i2c_sirfsoc_func(struct i2c_adapter *adap)
@@ -333,6 +333,7 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev)
 
        adap->algo = &i2c_sirfsoc_algo;
        adap->algo_data = siic;
+       adap->retries = 3;
 
        adap->dev.of_node = pdev->dev.of_node;
        adap->dev.parent = &pdev->dev;