Commit e21e254e authored by Denis CIOCCA's avatar Denis CIOCCA Committed by Jonathan Cameron

iio:accel: Register buffer also without specific trigger

This patch fix buffer registration that allows to use generic IIO trigger.
Signed-off-by: default avatarDenis Ciocca <denis.ciocca@st.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 267a29b9
...@@ -481,11 +481,11 @@ int st_accel_common_probe(struct iio_dev *indio_dev, ...@@ -481,11 +481,11 @@ int st_accel_common_probe(struct iio_dev *indio_dev,
if (err < 0) if (err < 0)
return err; return err;
if (irq > 0) { err = st_accel_allocate_ring(indio_dev);
err = st_accel_allocate_ring(indio_dev); if (err < 0)
if (err < 0) return err;
return err;
if (irq > 0) {
err = st_sensors_allocate_trigger(indio_dev, err = st_sensors_allocate_trigger(indio_dev,
ST_ACCEL_TRIGGER_OPS); ST_ACCEL_TRIGGER_OPS);
if (err < 0) if (err < 0)
...@@ -502,8 +502,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev, ...@@ -502,8 +502,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev,
if (irq > 0) if (irq > 0)
st_sensors_deallocate_trigger(indio_dev); st_sensors_deallocate_trigger(indio_dev);
st_accel_probe_trigger_error: st_accel_probe_trigger_error:
if (irq > 0) st_accel_deallocate_ring(indio_dev);
st_accel_deallocate_ring(indio_dev);
return err; return err;
} }
...@@ -514,10 +513,10 @@ void st_accel_common_remove(struct iio_dev *indio_dev) ...@@ -514,10 +513,10 @@ void st_accel_common_remove(struct iio_dev *indio_dev)
struct st_sensor_data *adata = iio_priv(indio_dev); struct st_sensor_data *adata = iio_priv(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
if (adata->get_irq_data_ready(indio_dev) > 0) { if (adata->get_irq_data_ready(indio_dev) > 0)
st_sensors_deallocate_trigger(indio_dev); st_sensors_deallocate_trigger(indio_dev);
st_accel_deallocate_ring(indio_dev);
} st_accel_deallocate_ring(indio_dev);
} }
EXPORT_SYMBOL(st_accel_common_remove); EXPORT_SYMBOL(st_accel_common_remove);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment