diff options
author | Mark A. Greer <mgreer@mvista.com> | 2005-12-16 14:08:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-16 14:25:25 -0500 |
commit | dfded4ae71080b53798c7bbf4628a9b22d1e3e8b (patch) | |
tree | 502757109327a16f225a01c166b144742d7fb7c9 | |
parent | 4d7672b46244abffea1953e55688c0ea143dd617 (diff) |
[PATCH] i2c: Fix i2c-mv64xxx compilation error
The busses/i2c-mv64xxx.c driver doesn't currently compile because of an
incorrect argument to dev_err(). This patch fixes that.
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index afd7634e5cc9..81031eb51056 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c | |||
@@ -529,14 +529,15 @@ mv64xxx_i2c_probe(struct platform_device *pd) | |||
529 | i2c_set_adapdata(&drv_data->adapter, drv_data); | 529 | i2c_set_adapdata(&drv_data->adapter, drv_data); |
530 | 530 | ||
531 | if (request_irq(drv_data->irq, mv64xxx_i2c_intr, 0, | 531 | if (request_irq(drv_data->irq, mv64xxx_i2c_intr, 0, |
532 | MV64XXX_I2C_CTLR_NAME, drv_data)) { | 532 | MV64XXX_I2C_CTLR_NAME, drv_data)) { |
533 | 533 | dev_err(&drv_data->adapter.dev, | |
534 | dev_err(dev, "mv64xxx: Can't register intr handler " | 534 | "mv64xxx: Can't register intr handler irq: %d\n", |
535 | "irq: %d\n", drv_data->irq); | 535 | drv_data->irq); |
536 | rc = -EINVAL; | 536 | rc = -EINVAL; |
537 | goto exit_unmap_regs; | 537 | goto exit_unmap_regs; |
538 | } else if ((rc = i2c_add_adapter(&drv_data->adapter)) != 0) { | 538 | } else if ((rc = i2c_add_adapter(&drv_data->adapter)) != 0) { |
539 | dev_err(dev, "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc); | 539 | dev_err(&drv_data->adapter.dev, |
540 | "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc); | ||
540 | goto exit_free_irq; | 541 | goto exit_free_irq; |
541 | } | 542 | } |
542 | 543 | ||