Skip to content

Commit 0187294

Browse files
dinghaoliujic23
authored andcommitted
iio: magnetometer: ak8974: Fix runtime PM imbalance on error
When devm_regmap_init_i2c() returns an error code, a pairing runtime PM usage counter decrement is needed to keep the counter balanced. For error paths after ak8974_set_power(), ak8974_detect() and ak8974_reset(), things are the same. However, When iio_triggered_buffer_setup() returns an error code, there will be two PM usgae counter decrements. Signed-off-by: Dinghao Liu <[email protected]> Fixes: 7c94a8b ("iio: magn: add a driver for AK8974") Reviewed-by: Linus Walleij <[email protected]> Cc: <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
1 parent d7369ae commit 0187294

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

drivers/iio/magnetometer/ak8974.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -862,19 +862,21 @@ static int ak8974_probe(struct i2c_client *i2c,
862862
ak8974->map = devm_regmap_init_i2c(i2c, &ak8974_regmap_config);
863863
if (IS_ERR(ak8974->map)) {
864864
dev_err(&i2c->dev, "failed to allocate register map\n");
865+
pm_runtime_put_noidle(&i2c->dev);
866+
pm_runtime_disable(&i2c->dev);
865867
return PTR_ERR(ak8974->map);
866868
}
867869

868870
ret = ak8974_set_power(ak8974, AK8974_PWR_ON);
869871
if (ret) {
870872
dev_err(&i2c->dev, "could not power on\n");
871-
goto power_off;
873+
goto disable_pm;
872874
}
873875

874876
ret = ak8974_detect(ak8974);
875877
if (ret) {
876878
dev_err(&i2c->dev, "neither AK8974 nor AMI30x found\n");
877-
goto power_off;
879+
goto disable_pm;
878880
}
879881

880882
ret = ak8974_selftest(ak8974);
@@ -884,14 +886,9 @@ static int ak8974_probe(struct i2c_client *i2c,
884886
ret = ak8974_reset(ak8974);
885887
if (ret) {
886888
dev_err(&i2c->dev, "AK8974 reset failed\n");
887-
goto power_off;
889+
goto disable_pm;
888890
}
889891

890-
pm_runtime_set_autosuspend_delay(&i2c->dev,
891-
AK8974_AUTOSUSPEND_DELAY);
892-
pm_runtime_use_autosuspend(&i2c->dev);
893-
pm_runtime_put(&i2c->dev);
894-
895892
indio_dev->dev.parent = &i2c->dev;
896893
switch (ak8974->variant) {
897894
case AK8974_WHOAMI_VALUE_AMI306:
@@ -957,6 +954,11 @@ static int ak8974_probe(struct i2c_client *i2c,
957954
goto cleanup_buffer;
958955
}
959956

957+
pm_runtime_set_autosuspend_delay(&i2c->dev,
958+
AK8974_AUTOSUSPEND_DELAY);
959+
pm_runtime_use_autosuspend(&i2c->dev);
960+
pm_runtime_put(&i2c->dev);
961+
960962
return 0;
961963

962964
cleanup_buffer:
@@ -965,7 +967,6 @@ static int ak8974_probe(struct i2c_client *i2c,
965967
pm_runtime_put_noidle(&i2c->dev);
966968
pm_runtime_disable(&i2c->dev);
967969
ak8974_set_power(ak8974, AK8974_PWR_OFF);
968-
power_off:
969970
regulator_bulk_disable(ARRAY_SIZE(ak8974->regs), ak8974->regs);
970971

971972
return ret;

0 commit comments

Comments
 (0)