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

Commit 66687e6a authored by Cristina Opriceana's avatar Cristina Opriceana Committed by Greg Kroah-Hartman
Browse files

iio: magnetometer: mag3110: Place driver on standby on error 



Place driver on standby mode on error in order to prevent wasting
power. Move standby function above to be seen by the new call.

Signed-off-by: default avatarCristina Opriceana <cristina.opriceana@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aa5587f3

drivers/iio/magnetometer/mag3110.c

+10 −8
Original line number Diff line number Diff line
@@ -321,6 +321,12 @@ static const struct iio_info mag3110_info = { 


static const unsigned long mag3110_scan_masks[] = {0x7, 0xf, 0};



static int mag3110_standby(struct mag3110_data *data)

{

	return i2c_smbus_write_byte_data(data->client, MAG3110_CTRL_REG1,

		data->ctrl_reg1 & ~MAG3110_CTRL_AC);

}



static int mag3110_probe(struct i2c_client *client,

			 const struct i2c_device_id *id)

{
@@ -360,12 +366,12 @@ static int mag3110_probe(struct i2c_client *client, 
	ret = i2c_smbus_write_byte_data(client, MAG3110_CTRL_REG2,

		MAG3110_CTRL_AUTO_MRST_EN);

	if (ret < 0)

		return ret;

		goto standby_on_error;



	ret = iio_triggered_buffer_setup(indio_dev, NULL,

		mag3110_trigger_handler, NULL);

	if (ret < 0)

		return ret;

		goto standby_on_error;



	ret = iio_device_register(indio_dev);

	if (ret < 0)
@@ -374,15 +380,11 @@ static int mag3110_probe(struct i2c_client *client, 


buffer_cleanup:

	iio_triggered_buffer_cleanup(indio_dev);

standby_on_error:

	mag3110_standby(iio_priv(indio_dev));

	return ret;

}



static int mag3110_standby(struct mag3110_data *data)

{

	return i2c_smbus_write_byte_data(data->client, MAG3110_CTRL_REG1,

		data->ctrl_reg1 & ~MAG3110_CTRL_AC);

}



static int mag3110_remove(struct i2c_client *client)

{

	struct iio_dev *indio_dev = i2c_get_clientdata(client);