Thanks Jonathan! all is fine...;) Denis > On 09/18/13 10:00, Denis CIOCCA wrote: >> This patch fix buffer registration that allows to use generic IIO trigger. >> >> Signed-off-by: Denis Ciocca <denis.ciocca@xxxxxx> > Forward ported and applied to the togreg branch of iio.git Thanks, > > Please do confirm I didn't do anything silly, but the port to the code > Lee updated seemed trivial so I'd rather do it and clear the patches > out of my queue ;) > >> --- >> drivers/iio/pressure/st_pressure_core.c | 17 ++++++++--------- >> 1 file changed, 8 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c >> index 93bff9b..312a093 100644 >> --- a/drivers/iio/pressure/st_pressure_core.c >> +++ b/drivers/iio/pressure/st_pressure_core.c >> @@ -262,11 +262,11 @@ int st_press_common_probe(struct iio_dev *indio_dev, >> if (err < 0) >> goto st_press_common_probe_error; >> >> - if (pdata->get_irq_data_ready(indio_dev) > 0) { >> - err = st_press_allocate_ring(indio_dev); >> - if (err < 0) >> - goto st_press_common_probe_error; >> + err = st_press_allocate_ring(indio_dev); >> + if (err < 0) >> + goto st_press_common_probe_error; >> >> + if (pdata->get_irq_data_ready(indio_dev) > 0) { >> err = st_sensors_allocate_trigger(indio_dev, >> ST_PRESS_TRIGGER_OPS); >> if (err < 0) >> @@ -283,8 +283,7 @@ st_press_device_register_error: >> if (pdata->get_irq_data_ready(indio_dev) > 0) >> st_sensors_deallocate_trigger(indio_dev); >> st_press_probe_trigger_error: >> - if (pdata->get_irq_data_ready(indio_dev) > 0) >> - st_press_deallocate_ring(indio_dev); >> + st_press_deallocate_ring(indio_dev); >> st_press_common_probe_error: >> return err; >> } >> @@ -295,10 +294,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); >> >> -- 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