summaryrefslogtreecommitdiff
path: root/drivers/i2c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-05-16 14:32:08 +0400
committerWolfram Sang <wsa@the-dreams.de>2013-06-06 01:06:29 +0400
commitd5ac456144413950d2d32ec4f22542e45be13cd7 (patch)
tree2c64a1f610691ed7c2b6a5f2c18abddbff9f81bc /drivers/i2c
parent1c2d721a7063bc3b8668de07f8d14dfbac4bf515 (diff)
downloadlinux-d5ac456144413950d2d32ec4f22542e45be13cd7.tar.xz
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>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-mv64xxx.c5
1 files 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));