| From 4a261b5fc63d9ed1d5ce6dc6c8fb62ab21462d47 Mon Sep 17 00:00:00 2001 |
| From: Russell King <rmk+kernel@arm.linux.org.uk> |
| Date: Thu, 16 May 2013 10:32:08 +0000 |
| Subject: I2C: mv64xxx: use return value from mv64xxx_i2c_map_regs() |
| |
| mv64xxx_i2c_map_regs() already returns an error code, so lets |
| propagate that to mv64xxx_i2c_probe()'s caller. |
| |
| Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> |
| Acked-by: Mark A. Greer <mgreer@animalcreek.com> |
| Signed-off-by: Wolfram Sang <wsa@the-dreams.de> |
| (cherry picked from commit d5ac456144413950d2d32ec4f22542e45be13cd7) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/i2c/busses/i2c-mv64xxx.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c |
| index 1a3abd6a0bfc..940a190b1a53 100644 |
| --- a/drivers/i2c/busses/i2c-mv64xxx.c |
| +++ b/drivers/i2c/busses/i2c-mv64xxx.c |
| @@ -619,10 +619,9 @@ mv64xxx_i2c_probe(struct platform_device *pd) |
| if (!drv_data) |
| return -ENOMEM; |
| |
| - if (mv64xxx_i2c_map_regs(pd, drv_data)) { |
| - rc = -ENODEV; |
| + rc = mv64xxx_i2c_map_regs(pd, drv_data); |
| + if (rc) |
| goto exit_kfree; |
| - } |
| |
| strlcpy(drv_data->adapter.name, MV64XXX_I2C_CTLR_NAME " adapter", |
| sizeof(drv_data->adapter.name)); |
| -- |
| 1.8.5.rc3 |
| |
