openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio:press: Register buffer also without specific trigger 

This patch fix buffer registration that allows to use generic IIO trigger.

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Denis CIOCCA 2013-09-18 10:00:00 +01:00 committed by Jonathan Cameron
parent f60b12b02e
commit 7a137c9c40
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/iio/pressure/st_pressure_core.c
View File

@ -349,11 +349,11 @@ int st_press_common_probe(struct iio_dev *indio_dev,
if (err < 0)
return err;
if (irq > 0) {
err = st_press_allocate_ring(indio_dev);
if (err < 0)
return err;
err = st_press_allocate_ring(indio_dev);
if (err < 0)
return err;
if (irq > 0) {
err = st_sensors_allocate_trigger(indio_dev,
ST_PRESS_TRIGGER_OPS);
if (err < 0)
@ -370,8 +370,7 @@ int st_press_common_probe(struct iio_dev *indio_dev,
if (irq > 0)
st_sensors_deallocate_trigger(indio_dev);
st_press_probe_trigger_error:
if (irq > 0)
st_press_deallocate_ring(indio_dev);
st_press_deallocate_ring(indio_dev);
return err;
}
@ -382,10 +381,10 @@ void st_press_common_remove(struct iio_dev *indio_dev)
struct st_sensor_data *pdata = iio_priv(indio_dev);
iio_device_unregister(indio_dev);
if (pdata->get_irq_data_ready(indio_dev) > 0) {
if (pdata->get_irq_data_ready(indio_dev) > 0)
st_sensors_deallocate_trigger(indio_dev);
st_press_deallocate_ring(indio_dev);
}
st_press_deallocate_ring(indio_dev);
}
EXPORT_SYMBOL(st_press_common_remove);