summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-04-25 09:30:36 +0800
committerSamuel Ortiz <sameo@linux.intel.com>2012-05-09 17:47:24 +0200
commitb683a0a675560307ebc458cf9044d98d27820b7c (patch)
treefc97cbdb3da5091023af5f150117ecebf772ed57
parent1379f49ea91a28f5c023d041aab785c3de60c65d (diff)
downloadlinux-stable-b683a0a675560307ebc458cf9044d98d27820b7c.tar.gz
linux-stable-b683a0a675560307ebc458cf9044d98d27820b7c.tar.bz2
linux-stable-b683a0a675560307ebc458cf9044d98d27820b7c.zip
mfd: Return proper error if tps65090 regmap_init_i2c fails
Return proper error instead of 0 if regmap_init_i2c fails. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Venu Byravarasu <vbyravarasu@nvidia.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/tps65090.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index 6dc4c345ea68..d9940870a688 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -297,10 +297,10 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client,
tps65090->rmap = regmap_init_i2c(tps65090->client,
&tps65090_regmap_config);
if (IS_ERR(tps65090->rmap)) {
- dev_err(&client->dev, "regmap_init failed with err: %ld\n",
- PTR_ERR(tps65090->rmap));
+ ret = PTR_ERR(tps65090->rmap);
+ dev_err(&client->dev, "regmap_init failed with err: %d\n", ret);
goto err_irq_exit;
- };
+ }
ret = mfd_add_devices(tps65090->dev, -1, tps65090s,
ARRAY_SIZE(tps65090s), NULL, 0);