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

Commit ff34ed6d authored by Peter Meerwald-Stadler's avatar Peter Meerwald-Stadler Committed by Jonathan Cameron
Browse files

iio: light: vcnl4000: Add missing locking 



Signed-off-by: default avatarPeter Meerwald-Stadler <pmeerw@pmeerw.net>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 5d693139

drivers/iio/light/vcnl4000.c

+14 −4
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 


struct vcnl4000_data {

	struct i2c_client *client;

	struct mutex lock;

};



static const struct i2c_device_id vcnl4000_id[] = {
@@ -63,16 +64,18 @@ static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask, 
	__be16 buf;

	int ret;



	mutex_lock(&data->lock);



	ret = i2c_smbus_write_byte_data(data->client, VCNL4000_COMMAND,

					req_mask);

	if (ret < 0)

		return ret;

		goto fail;



	/* wait for data to become ready */

	while (tries--) {

		ret = i2c_smbus_read_byte_data(data->client, VCNL4000_COMMAND);

		if (ret < 0)

			return ret;

			goto fail;

		if (ret & rdy_mask)

			break;

		msleep(20); /* measurement takes up to 100 ms */
@@ -81,17 +84,23 @@ static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask, 
	if (tries < 0) {

		dev_err(&data->client->dev,

			"vcnl4000_measure() failed, data not ready\n");

		return -EIO;

		ret = -EIO;

		goto fail;

	}



	ret = i2c_smbus_read_i2c_block_data(data->client,

		data_reg, sizeof(buf), (u8 *) &buf);

	if (ret < 0)

		return ret;

		goto fail;



	mutex_unlock(&data->lock);

	*val = be16_to_cpu(buf);



	return 0;



fail:

	mutex_unlock(&data->lock);

	return ret;

}



static const struct iio_chan_spec vcnl4000_channels[] = {
@@ -163,6 +172,7 @@ static int vcnl4000_probe(struct i2c_client *client, 
	data = iio_priv(indio_dev);

	i2c_set_clientdata(client, indio_dev);

	data->client = client;

	mutex_init(&data->lock);



	ret = i2c_smbus_read_byte_data(data->client, VCNL4000_PROD_REV);

	if (ret < 0)