UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

i2c-nomadik: reset the hw after status check 

In case of I2C timeout, reset the HW only after the HW status
is read, otherwise the staus will be lost.

Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>
Reviewed-by: Jonas Aberg <jonas.aberg@stericsson.com>
Reviewed-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
Virupax Sadashivpetimath 2011-05-13 12:30:53 +02:00 committed by Ben Dooks
parent b5e890f7e7
commit 0511f643cb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/i2c/busses/i2c-nomadik.c
View File

@ -428,10 +428,9 @@ static int read_i2c(struct nmk_i2c_dev *dev)
} }
if (timeout == 0) { if (timeout == 0) {
/* controller has timedout, re-init the h/w */ /* Controller timed out */
dev_err(&dev->pdev->dev, "read from slave 0x%x timed out\n", dev_err(&dev->pdev->dev, "read from slave 0x%x timed out\n",
dev->cli.slave_adr); dev->cli.slave_adr);
(void) init_hw(dev);
status = -ETIMEDOUT; status = -ETIMEDOUT;
} }
return status; return status;
@ -516,10 +515,9 @@ static int write_i2c(struct nmk_i2c_dev *dev)
} }
if (timeout == 0) { if (timeout == 0) {
/* controller has timedout, re-init the h/w */ /* Controller timed out */
dev_err(&dev->pdev->dev, "write to slave 0x%x timed out\n", dev_err(&dev->pdev->dev, "write to slave 0x%x timed out\n",
dev->cli.slave_adr); dev->cli.slave_adr);
(void) init_hw(dev);
status = -ETIMEDOUT; status = -ETIMEDOUT;
} }
@ -638,6 +636,8 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
abort_causes[cause]); abort_causes[cause]);
} }
(void) init_hw(dev);
status = status ? status : dev->result; status = status ? status : dev->result;
break; break;