diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2015-06-20 21:03:22 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2015-06-23 19:50:27 +0200 |
| commit | 365322fb32e82b20758e8a18e3aa94692ce2a3d1 (patch) | |
| tree | 7564bf87ba8151044b857869bacbc5c4f85cb5c9 /drivers/i2c/busses/i2c-sh_mobile.c | |
| parent | 41bdbd2887591a3fa586e71cd2b462c3525845a3 (diff) | |
| download | linux-365322fb32e82b20758e8a18e3aa94692ce2a3d1.tar.gz | |
i2c: sh_mobile: use proper type for timeout
wait_event_timeout returns long, not int. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-sh_mobile.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-sh_mobile.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index 5490bfb58f3e..47659a925e09 100644 --- a/drivers/i2c/busses/i2c-sh_mobile.c +++ b/drivers/i2c/busses/i2c-sh_mobile.c @@ -730,7 +730,8 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter, struct sh_mobile_i2c_data *pd = i2c_get_adapdata(adapter); struct i2c_msg *msg; int err = 0; - int i, k; + int i; + long timeout; activate_ch(pd); @@ -749,10 +750,10 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter, i2c_op(pd, OP_START, 0); /* The interrupt handler takes care of the rest... */ - k = wait_event_timeout(pd->wait, + timeout = wait_event_timeout(pd->wait, pd->sr & (ICSR_TACK | SW_DONE), adapter->timeout); - if (!k) { + if (!timeout) { dev_err(pd->dev, "Transfer request timed out\n"); if (pd->dma_direction != DMA_NONE) sh_mobile_i2c_cleanup_dma(pd); |