summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2015-06-20 21:03:20 +0200
committerWolfram Sang <wsa@the-dreams.de>2015-06-23 19:50:20 +0200
commitb6763d0da5c16ea8770252c36ba2afca76aaedbd (patch)
tree7e78a20af0ce5f1754e306c66e2f22f03282d485 /drivers/i2c
parentefd2c6118e49152bea891706432ac3c9579836fe (diff)
downloadop-kernel-dev-b6763d0da5c16ea8770252c36ba2afca76aaedbd.zip
op-kernel-dev-b6763d0da5c16ea8770252c36ba2afca76aaedbd.tar.gz
i2c: rcar: 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')
-rw-r--r--drivers/i2c/busses/i2c-rcar.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index e57e520..d8361da 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -490,7 +490,8 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
struct rcar_i2c_priv *priv = i2c_get_adapdata(adap);
struct device *dev = rcar_i2c_priv_to_dev(priv);
unsigned long flags;
- int i, ret, timeout;
+ int i, ret;
+ long timeout;
pm_runtime_get_sync(dev);
OpenPOWER on IntegriCloud