On 24/06/16 10:11, Linus Walleij wrote: > The AK8975 has two power sources: Vdd (analog voltage supply) > and Vid (digital voltage supply). Optionally also obtain the Vid > supply regulator and enable it. > > If an error occurs when enabling one of the regulators: bail out. > > Cc: Gregor Boirie <gregor.boirie@xxxxxxxxxx> > Cc: Richard Leitner <dev@xxxxxxxxxx> > Cc: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx> > Cc: Lars-Peter Clausen <lars@xxxxxxxxxx> > Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx> This didn't go on cleanly but the fix is simple. Somewhere along the way the text in one of the messages changed... If you could check this out in the testing branch of iio.git that would be great. Might need a followup patch to cleanup that message. What fun ;) Jonathan > --- > ChangeLog v2->v3: > - No changes. Numbered v2 to be part of the patch set. > ChangeLog v1->v2: > - Just obtain the other regulator exactly like the first without > trying to be fancy. > - Rebase and rewrite on top of the patch fixing up the regulator > usage. > --- > drivers/iio/magnetometer/ak8975.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c > index 05e9d5041e7a..62f73d9d38b4 100644 > --- a/drivers/iio/magnetometer/ak8975.c > +++ b/drivers/iio/magnetometer/ak8975.c > @@ -400,6 +400,19 @@ static int ak8975_power_on(struct i2c_client *client) > "Failed to enable specified Vdd supply\n"); > return ret; > } > + > + data->vid = devm_regulator_get(&client->dev, "vid"); > + if (IS_ERR(data->vid)) { > + ret = PTR_ERR(data->vid); > + } else { > + ret = regulator_enable(data->vid); > + } > + if (ret) { > + dev_warn(&client->dev, > + "Failed to enable specified Vid supply\n"); > + return ret; > + } > + return 0; > } > > /* Disable attached power regulator if any. */ > @@ -408,6 +421,7 @@ static void ak8975_power_off(const struct i2c_client *client) > const struct iio_dev *indio_dev = i2c_get_clientdata(client); > const struct ak8975_data *data = iio_priv(indio_dev); > > + regulator_disable(data->vid); > regulator_disable(data->vdd); > } > > -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html