diff options
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 c3869d94ad42..bbab0e166630 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) & |