Skip to content

Commit

Permalink
iio:tcs3472: Check for buffer enabled and locking
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
  • Loading branch information
Peter Meerwald authored and Jonathan Cameron committed Jul 7, 2014
1 parent 4ff9f63 commit 2a58b4f
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion drivers/iio/light/tcs3472.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@

struct tcs3472_data {
struct i2c_client *client;
struct mutex lock;
u8 enable;
u8 control;
u8 atime;
Expand Down Expand Up @@ -116,10 +117,17 @@ static int tcs3472_read_raw(struct iio_dev *indio_dev,

switch (mask) {
case IIO_CHAN_INFO_RAW:
if (iio_buffer_enabled(indio_dev))
return -EBUSY;

mutex_lock(&data->lock);
ret = tcs3472_req_data(data);
if (ret < 0)
if (ret < 0) {
mutex_unlock(&data->lock);
return ret;
}
ret = i2c_smbus_read_word_data(data->client, chan->address);
mutex_unlock(&data->lock);
if (ret < 0)
return ret;
*val = ret;
Expand Down Expand Up @@ -255,6 +263,7 @@ static int tcs3472_probe(struct i2c_client *client,
data = iio_priv(indio_dev);
i2c_set_clientdata(client, indio_dev);
data->client = client;
mutex_init(&data->lock);

indio_dev->dev.parent = &client->dev;
indio_dev->info = &tcs3472_info;
Expand Down

0 comments on commit 2a58b4f

Please sign in to comment.