On 06/04/16 22:06, Lars-Peter Clausen wrote:
> On 04/06/2016 06:11 AM, Alison Schofield wrote:
>> Replace the code that guarantees the device stays in direct mode with
>> iio_device_{claim|release}_direct_mode() which does same.
>>
>> Signed-off-by: Alison Schofield <amsfield22@xxxxxxxxx>
>
> Looks good, thanks.
>
> Acked-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
>
Applied to the togreg branch of iio.git - thanks.
Jonathan
>> ---
>> Changed in v2:
>> - removed improper application of claim/release from intr handler
>> - updated changelog
>>
>> drivers/staging/iio/adc/ad7606_core.c | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c
>> index 6dbc811..f79ee61 100644
>> --- a/drivers/staging/iio/adc/ad7606_core.c
>> +++ b/drivers/staging/iio/adc/ad7606_core.c
>> @@ -88,12 +88,12 @@ static int ad7606_read_raw(struct iio_dev *indio_dev,
>>
>> switch (m) {
>> case IIO_CHAN_INFO_RAW:
>> - mutex_lock(&indio_dev->mlock);
>> - if (iio_buffer_enabled(indio_dev))
>> - ret = -EBUSY;
>> - else
>> - ret = ad7606_scan_direct(indio_dev, chan->address);
>> - mutex_unlock(&indio_dev->mlock);
>> + ret = iio_device_claim_direct_mode(indio_dev);
>> + if (ret)
>> + return ret;
>> +
>> + ret = ad7606_scan_direct(indio_dev, chan->address);
>> + iio_device_release_direct_mode(indio_dev);
>>
>> if (ret < 0)
>> return ret;
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
