Commit 2a58b4f8 authored by Peter Meerwald's avatar Peter Meerwald Committed by Jonathan Cameron

iio:tcs3472: Check for buffer enabled and locking

Signed-off-by: default avatarPeter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 4ff9f633
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
struct tcs3472_data { struct tcs3472_data {
struct i2c_client *client; struct i2c_client *client;
struct mutex lock;
u8 enable; u8 enable;
u8 control; u8 control;
u8 atime; u8 atime;
...@@ -116,10 +117,17 @@ static int tcs3472_read_raw(struct iio_dev *indio_dev, ...@@ -116,10 +117,17 @@ static int tcs3472_read_raw(struct iio_dev *indio_dev,
switch (mask) { switch (mask) {
case IIO_CHAN_INFO_RAW: case IIO_CHAN_INFO_RAW:
if (iio_buffer_enabled(indio_dev))
return -EBUSY;
mutex_lock(&data->lock);
ret = tcs3472_req_data(data); ret = tcs3472_req_data(data);
if (ret < 0) if (ret < 0) {
mutex_unlock(&data->lock);
return ret; return ret;
}
ret = i2c_smbus_read_word_data(data->client, chan->address); ret = i2c_smbus_read_word_data(data->client, chan->address);
mutex_unlock(&data->lock);
if (ret < 0) if (ret < 0)
return ret; return ret;
*val = ret; *val = ret;
...@@ -255,6 +263,7 @@ static int tcs3472_probe(struct i2c_client *client, ...@@ -255,6 +263,7 @@ static int tcs3472_probe(struct i2c_client *client,
data = iio_priv(indio_dev); data = iio_priv(indio_dev);
i2c_set_clientdata(client, indio_dev); i2c_set_clientdata(client, indio_dev);
data->client = client; data->client = client;
mutex_init(&data->lock);
indio_dev->dev.parent = &client->dev; indio_dev->dev.parent = &client->dev;
indio_dev->info = &tcs3472_info; indio_dev->info = &tcs3472_info;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment