| Message ID | ce75aac3-2aba-4435-8419-02e59fdd862b@moroto.mountain (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: frequency: admv1013: propagate errors from regulator_get_voltage() | expand |
On Tue, 18 Jul 2023 10:02:18 +0300 Dan Carpenter <dan.carpenter@linaro.org> wrote: > The regulator_get_voltage() function returns negative error codes. > This function saves it to an unsigned int and then does some range > checking and, since the error code falls outside the correct range, > it returns -EINVAL. > > Beyond the messiness, this is bad because the regulator_get_voltage() > function can return -EPROBE_DEFER and it's important to propagate that > back properly so it can be handled. > > Fixes: da35a7b526d9 ("iio: frequency: admv1013: add support for ADMV1013") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Applied to the fixes-togreg branch of iio.git and marked for stable. Thanks, Jonathan > --- > drivers/iio/frequency/admv1013.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/frequency/admv1013.c b/drivers/iio/frequency/admv1013.c > index 9bf8337806fc..8c8e0bbfc99f 100644 > --- a/drivers/iio/frequency/admv1013.c > +++ b/drivers/iio/frequency/admv1013.c > @@ -344,9 +344,12 @@ static int admv1013_update_quad_filters(struct admv1013_state *st) > > static int admv1013_update_mixer_vgate(struct admv1013_state *st) > { > - unsigned int vcm, mixer_vgate; > + unsigned int mixer_vgate; > + int vcm; > > vcm = regulator_get_voltage(st->reg); > + if (vcm < 0) > + return vcm; > > if (vcm < 1800000) > mixer_vgate = (2389 * vcm / 1000000 + 8100) / 100;
diff --git a/drivers/iio/frequency/admv1013.c b/drivers/iio/frequency/admv1013.c index 9bf8337806fc..8c8e0bbfc99f 100644 --- a/drivers/iio/frequency/admv1013.c +++ b/drivers/iio/frequency/admv1013.c @@ -344,9 +344,12 @@ static int admv1013_update_quad_filters(struct admv1013_state *st) static int admv1013_update_mixer_vgate(struct admv1013_state *st) { - unsigned int vcm, mixer_vgate; + unsigned int mixer_vgate; + int vcm; vcm = regulator_get_voltage(st->reg); + if (vcm < 0) + return vcm; if (vcm < 1800000) mixer_vgate = (2389 * vcm / 1000000 + 8100) / 100;
The regulator_get_voltage() function returns negative error codes. This function saves it to an unsigned int and then does some range checking and, since the error code falls outside the correct range, it returns -EINVAL. Beyond the messiness, this is bad because the regulator_get_voltage() function can return -EPROBE_DEFER and it's important to propagate that back properly so it can be handled. Fixes: da35a7b526d9 ("iio: frequency: admv1013: add support for ADMV1013") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- drivers/iio/frequency/admv1013.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)