diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 19:29:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 19:29:27 -0500 |
| commit | b4669d66fb1488fd9cebe0b8da447cfeb86109ba (patch) | |
| tree | 2beaba0e7d8acac9703667aff5f9bc9f4d4357d6 /drivers/i2c/busses/i2c-pxa.c | |
| parent | b43d4ddaec2b33fd6eaf0bed970c86ab08a52aaf (diff) | |
| parent | c5e3fbf22ccba0879b174fab7ec0e322b1266c2c (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/i2c/busses/i2c-pxa.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 86e2234faf80..7579f4b256a8 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
| @@ -861,7 +861,7 @@ static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id, struct pt_regs *r | |||
| 861 | decode_ISR(isr); | 861 | decode_ISR(isr); |
| 862 | } | 862 | } |
| 863 | 863 | ||
| 864 | if (i2c->irqlogidx < sizeof(i2c->isrlog)/sizeof(u32)) | 864 | if (i2c->irqlogidx < ARRAY_SIZE(i2c->isrlog)) |
| 865 | i2c->isrlog[i2c->irqlogidx++] = isr; | 865 | i2c->isrlog[i2c->irqlogidx++] = isr; |
| 866 | 866 | ||
| 867 | show_state(i2c); | 867 | show_state(i2c); |