diff --git a/[refs] b/[refs] index 9752cfac1d6b..ab3c3f9471d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f6532519feab921856f41b30a2397ee25f4de49 +refs/heads/master: 036de8efae4b81f8e1504fab654070cecce6dfa9 diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index 01f7702a805d..47fc6e6fe9bc 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/drivers/regulator/core.c @@ -540,8 +540,8 @@ static void drms_uA_update(struct regulator_dev *rdev) err = regulator_check_drms(rdev); if (err < 0 || !rdev->desc->ops->get_optimum_mode || - !rdev->desc->ops->get_voltage || !rdev->desc->ops->set_mode); - return; + !rdev->desc->ops->get_voltage || !rdev->desc->ops->set_mode) + return; /* get output voltage */ output_uV = rdev->desc->ops->get_voltage(rdev);