redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

iio: magnetometer: mag3110: claim direct mode during raw writes 

Driver was checking for direct mode but not locking it.  Use
claim/release helper functions to guarantee the device stays
in direct mode during raw writes.

Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Acked-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
hifive-unleashed-5.1
Alison Schofield 2017-01-20 12:39:32 -08:00 committed by Jonathan Cameron
parent 0bf1a2aac6
commit 80dea21f95
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/iio/magnetometer/mag3110.c
View File

@ -222,29 +222,39 @@ static int mag3110_write_raw(struct iio_dev *indio_dev,
int val, int val2, long mask) int val, int val2, long mask)
{ {
struct mag3110_data *data = iio_priv(indio_dev); struct mag3110_data *data = iio_priv(indio_dev);
int rate; int rate, ret;
if (iio_buffer_enabled(indio_dev)) ret = iio_device_claim_direct_mode(indio_dev);
return -EBUSY; if (ret)
return ret;
switch (mask) { switch (mask) {
case IIO_CHAN_INFO_SAMP_FREQ: case IIO_CHAN_INFO_SAMP_FREQ:
rate = mag3110_get_samp_freq_index(data, val, val2); rate = mag3110_get_samp_freq_index(data, val, val2);
if (rate < 0) if (rate < 0) {
return -EINVAL; ret = -EINVAL;
break;
}
data->ctrl_reg1 &= ~MAG3110_CTRL_DR_MASK; data->ctrl_reg1 &= ~MAG3110_CTRL_DR_MASK;
data->ctrl_reg1 |= rate << MAG3110_CTRL_DR_SHIFT; data->ctrl_reg1 |= rate << MAG3110_CTRL_DR_SHIFT;
return i2c_smbus_write_byte_data(data->client, ret = i2c_smbus_write_byte_data(data->client,
MAG3110_CTRL_REG1, data->ctrl_reg1); MAG3110_CTRL_REG1, data->ctrl_reg1);
break;
case IIO_CHAN_INFO_CALIBBIAS: case IIO_CHAN_INFO_CALIBBIAS:
if (val < -10000 || val > 10000) if (val < -10000 || val > 10000) {
return -EINVAL; ret = -EINVAL;
return i2c_smbus_write_word_swapped(data->client, break;
}
ret = i2c_smbus_write_word_swapped(data->client,
MAG3110_OFF_X + 2 * chan->scan_index, val << 1); MAG3110_OFF_X + 2 * chan->scan_index, val << 1);
break;
default: default:
return -EINVAL; ret = -EINVAL;
break;
} }
iio_device_release_direct_mode(indio_dev);
return ret;
} }
static irqreturn_t mag3110_trigger_handler(int irq, void *p) static irqreturn_t mag3110_trigger_handler(int irq, void *p)