summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-07-06 20:57:18 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2011-07-31 23:28:26 +0200
commit6daa663dc42957ca6c794a84fe07fa09f0273ff9 (patch)
treece482f6811a87c7b77fe7a69b080458fd89151c3
parentmfd: Don't leak init_data in tps65910_i2c_probe (diff)
downloadlinux-6daa663dc42957ca6c794a84fe07fa09f0273ff9.tar.xz
linux-6daa663dc42957ca6c794a84fe07fa09f0273ff9.zip
regulator: Storing tps65912 error codes in u8
get_ctrl_reg() returns -EINVAL so the error handling won't work here if reg is a u8. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/regulator/tps65912-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c
index d2c6542776f1..3a9313e00fac 100644
--- a/drivers/regulator/tps65912-regulator.c
+++ b/drivers/regulator/tps65912-regulator.c
@@ -417,7 +417,7 @@ static int tps65912_reg_enable(struct regulator_dev *dev)
struct tps65912_reg *pmic = rdev_get_drvdata(dev);
struct tps65912 *mfd = pmic->mfd;
int id = rdev_get_id(dev);
- u8 reg;
+ int reg;
if (id < TPS65912_REG_DCDC1 || id > TPS65912_REG_LDO10)
return -EINVAL;