Skip to content

Commit

Permalink
regulator: core: Return error in get optional stub
Browse files Browse the repository at this point in the history
Drivers that call regulator_get_optional are tolerant to the absence of
that regulator.  By modifying the value returned from the stub function
to match that seen when a regulator isn't present, callers can wrap the
regulator logic with an IS_ERR based conditional even if they happen to
call regulator_is_supported_voltage.  This improves efficiency as well
as eliminates the possibility for a very subtle bug.

Signed-off-by: Tim Kryger <tim.kryger@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Tim Kryger authored and Mark Brown committed Apr 18, 2014
1 parent c9eaa44 commit df7926f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/linux/regulator/consumer.h
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,14 @@ regulator_get_exclusive(struct device *dev, const char *id)
static inline struct regulator *__must_check
regulator_get_optional(struct device *dev, const char *id)
{
return NULL;
return ERR_PTR(-ENODEV);
}


static inline struct regulator *__must_check
devm_regulator_get_optional(struct device *dev, const char *id)
{
return NULL;
return ERR_PTR(-ENODEV);
}

static inline void regulator_put(struct regulator *regulator)
Expand Down

0 comments on commit df7926f

Please sign in to comment.