diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 18:55:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 18:55:56 -0400 |
| commit | 996a798abb36aa92d0bad64ba23f4c685ce39537 (patch) | |
| tree | 77e2b9cbccc55862a0fd14eabdcb21521d98b70b /drivers/i2c/busses/i2c-mv64xxx.c | |
| parent | a57c21c7159e07c27e317ea3513dfb382be3f153 (diff) | |
| parent | 5d3f33318a6c1f79f89e3dd2c7ddc11e0da14895 (diff) | |
Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux
* 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
[PATCH] i2c-imx: make bus available early
i2c-mv64xxx: correct mv64xxx_i2c_intr() return type
Diffstat (limited to 'drivers/i2c/busses/i2c-mv64xxx.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index c3869d94ad4..bbab0e16663 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c | |||
| @@ -293,13 +293,13 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) | |||
| 293 | } | 293 | } |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | static int | 296 | static irqreturn_t |
| 297 | mv64xxx_i2c_intr(int irq, void *dev_id) | 297 | mv64xxx_i2c_intr(int irq, void *dev_id) |
| 298 | { | 298 | { |
| 299 | struct mv64xxx_i2c_data *drv_data = dev_id; | 299 | struct mv64xxx_i2c_data *drv_data = dev_id; |
| 300 | unsigned long flags; | 300 | unsigned long flags; |
| 301 | u32 status; | 301 | u32 status; |
| 302 | int rc = IRQ_NONE; | 302 | irqreturn_t rc = IRQ_NONE; |
| 303 | 303 | ||
| 304 | spin_lock_irqsave(&drv_data->lock, flags); | 304 | spin_lock_irqsave(&drv_data->lock, flags); |
| 305 | while (readl(drv_data->reg_base + MV64XXX_I2C_REG_CONTROL) & | 305 | while (readl(drv_data->reg_base + MV64XXX_I2C_REG_CONTROL) & |