summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-nomadik.c
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-02-08 07:34:43 -0500
committerWolfram Sang <wsa@the-dreams.de>2015-03-15 10:51:13 +0100
commitf87b53a0858ea69e65d7f19573907a60b2e32e66 (patch)
tree2ed16a20c110ac01ae44d6234f6727b430caa71b /drivers/i2c/busses/i2c-nomadik.c
parent9bb9fee9e9423082ff23f21257bfc68b5eacd504 (diff)
downloadop-kernel-dev-f87b53a0858ea69e65d7f19573907a60b2e32e66.zip
op-kernel-dev-f87b53a0858ea69e65d7f19573907a60b2e32e66.tar.gz
i2c: nomadik: match status to return type of read_i2c
return type of read_i2c() is int not u32. As the assignments to status are consistent with int here its type is changed to int. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-nomadik.c')
-rw-r--r--drivers/i2c/busses/i2c-nomadik.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 6ca6ad6..bcd17e8 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -446,7 +446,7 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
*/
static int read_i2c(struct nmk_i2c_dev *dev, u16 flags)
{
- u32 status = 0;
+ int status = 0;
u32 mcr, irq_mask;
unsigned long timeout;
OpenPOWER on IntegriCloud