Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / ir-kbd-i2c.c

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 210582d420f861c457977ba18ecab8c36e6ef627..ed92b6f7187a6eac7b3e5da338b20995abc2a0bb 100644 (file)
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -173,7 +173,7 @@ static int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
                return -EIO;
        }
 
-       for (start = 0; start<4; start++) {
+       for (start = 0; start < ARRAY_SIZE(b); start++) {
                if (b[start] == marker) {
                        code=b[(start+parity_offset+1)%4];
                        parity=b[(start+parity_offset)%4];