diff --git a/[refs] b/[refs] index 2133b3625e7f..d12af4134366 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 532691635475487b8c1d6fc618bd123084904897 +refs/heads/master: 9fc886a1880766fb91cb27c2e96bd814cef640d6 diff --git a/trunk/drivers/regulator/max8649.c b/trunk/drivers/regulator/max8649.c index b06a2399587c..d0e1180ad961 100644 --- a/trunk/drivers/regulator/max8649.c +++ b/trunk/drivers/regulator/max8649.c @@ -150,7 +150,7 @@ static int max8649_enable_time(struct regulator_dev *rdev) if (ret != 0) return ret; val &= MAX8649_VOL_MASK; - voltage = max8649_list_voltage(rdev, (unsigned char)ret); /* uV */ + voltage = max8649_list_voltage(rdev, (unsigned char)val); /* uV */ /* get rate */ ret = regmap_read(info->regmap, MAX8649_RAMP, &val);