]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
i2c: rk3x: fix interrupt handling issue
authoraddy ke <addy.ke@rock-chips.com>
Fri, 8 Aug 2014 09:41:40 +0000 (17:41 +0800)
committerWolfram Sang <wsa@the-dreams.de>
Fri, 8 Aug 2014 16:33:57 +0000 (18:33 +0200)
If slave holds scl, I2C_IPD[7] will be set 1 by controller
for debugging. Driver must ignore it.

[    5.752391] rk3x-i2c ff160000.i2c: unexpected irq in WRITE: 0x80
[    5.939027] rk3x-i2c ff160000.i2c: timeout, ipd: 0x80, state: 4

Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
drivers/i2c/busses/i2c-rk3x.c

index a9791509966a07e94e028b07396e1d4be95b4b2b..69e11853e8bff187e09459167506ec24b8f7a122 100644 (file)
@@ -399,7 +399,7 @@ static irqreturn_t rk3x_i2c_irq(int irqno, void *dev_id)
        }
 
        /* is there anything left to handle? */
-       if (unlikely(ipd == 0))
+       if (unlikely((ipd & REG_INT_ALL) == 0))
                goto out;
 
        switch (i2c->state) {