Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a28f8dbd authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Greg Kroah-Hartman
Browse files

iio: Fix error handling for PM 



commit 632fe0bb8c5b9c06ec961f575ee42a6fff5eceeb upstream.

The pm_runtime_enable will increase power disable depth.
If the probe fails, we should use pm_runtime_disable() to balance
pm_runtime_enable(). In the PM Runtime docs:
    Drivers in ->remove() callback should undo the runtime PM changes done
    in ->probe(). Usually this means calling pm_runtime_disable(),
    pm_runtime_dont_use_autosuspend() etc.
We should do this in error handling.

Fix this problem for the following drivers: bmc150, bmg160, kmx61,
kxcj-1013, mma9551, mma9553.

Fixes: 7d0ead5c ("iio: Reconcile operation order between iio_register/unregister and pm functions")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220106112309.16879-1-linmq006@gmail.com


Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8fff0310

drivers/iio/accel/bmc150-accel-core.c

+4 −1
Original line number Diff line number Diff line
@@ -1649,11 +1649,14 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, 
	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(dev, "Unable to register iio device\n");

		goto err_trigger_unregister;

		goto err_pm_cleanup;

	}



	return 0;



err_pm_cleanup:

	pm_runtime_dont_use_autosuspend(dev);

	pm_runtime_disable(dev);

err_trigger_unregister:

	bmc150_accel_unregister_triggers(data, BMC150_ACCEL_TRIGGERS - 1);

err_buffer_cleanup:

drivers/iio/accel/kxcjk-1013.c

+4 −1
Original line number Diff line number Diff line
@@ -1409,11 +1409,14 @@ static int kxcjk1013_probe(struct i2c_client *client, 
	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(&client->dev, "unable to register iio device\n");

		goto err_buffer_cleanup;

		goto err_pm_cleanup;

	}



	return 0;



err_pm_cleanup:

	pm_runtime_dont_use_autosuspend(&client->dev);

	pm_runtime_disable(&client->dev);

err_buffer_cleanup:

	iio_triggered_buffer_cleanup(indio_dev);

err_trigger_unregister:

drivers/iio/accel/mma9551.c

+4 −1
Original line number Diff line number Diff line
@@ -496,11 +496,14 @@ static int mma9551_probe(struct i2c_client *client, 
	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(&client->dev, "unable to register iio device\n");

		goto out_poweroff;

		goto err_pm_cleanup;

	}



	return 0;



err_pm_cleanup:

	pm_runtime_dont_use_autosuspend(&client->dev);

	pm_runtime_disable(&client->dev);

out_poweroff:

	mma9551_set_device_state(client, false);

drivers/iio/accel/mma9553.c

+4 −1
Original line number Diff line number Diff line
@@ -1135,12 +1135,15 @@ static int mma9553_probe(struct i2c_client *client, 
	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(&client->dev, "unable to register iio device\n");

		goto out_poweroff;

		goto err_pm_cleanup;

	}



	dev_dbg(&indio_dev->dev, "Registered device %s\n", name);

	return 0;



err_pm_cleanup:

	pm_runtime_dont_use_autosuspend(&client->dev);

	pm_runtime_disable(&client->dev);

out_poweroff:

	mma9551_set_device_state(client, false);

	return ret;

drivers/iio/gyro/bmg160_core.c

+4 −1
Original line number Diff line number Diff line
@@ -1173,11 +1173,14 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, 
	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(dev, "unable to register iio device\n");

		goto err_buffer_cleanup;

		goto err_pm_cleanup;

	}



	return 0;



err_pm_cleanup:

	pm_runtime_dont_use_autosuspend(dev);

	pm_runtime_disable(dev);

err_buffer_cleanup:

	iio_triggered_buffer_cleanup(indio_dev);

err_trigger_unregister: