diff options
| author | Alban Bedel <alban.bedel@avionic-design.de> | 2015-04-20 13:57:18 +0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2018-12-11 16:02:26 +0100 |
| commit | eb579791923041fa8e2f4bce226651bdf2c47088 (patch) | |
| tree | 07d5d51f2373c210a972d3987790e8874d55a363 | |
| parent | fd2d5da83d91ec6f6120aad1326bf50dd8d6ee63 (diff) | |
iio:st_sensors: Fix oops when probing SPI devices
In SPI mode the transfer buffer is locked with a mutex. However this
mutex is only initilized after the probe, but some transfer needs to
be done in the probe.
To fix this bug we move the mutex initialization at the beginning of
the device probe.
Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de>
Acked-by: Denis Ciocca <denis.ciocca@st.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Moyster <oysterized@gmail.com>
omitted pressure driver changes (missing in this kernel)
| -rw-r--r-- | drivers/iio/accel/st_accel_core.c | 1 | ||||
| -rw-r--r-- | drivers/iio/common/st_sensors/st_sensors_core.c | 2 | ||||
| -rw-r--r-- | drivers/iio/gyro/st_gyro_core.c | 1 | ||||
| -rw-r--r-- | drivers/iio/magnetometer/st_magn_core.c | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c index 4e06fcf5b..e1af3b71d 100644 --- a/drivers/iio/accel/st_accel_core.c +++ b/drivers/iio/accel/st_accel_core.c @@ -458,6 +458,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev, indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->info = &accel_info; + mutex_init(&adata->tb.buf_lock); err = st_sensors_check_device_support(indio_dev, ARRAY_SIZE(st_accel_sensors), st_accel_sensors); diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c index 7ba1ef270..5d7e8a450 100644 --- a/drivers/iio/common/st_sensors/st_sensors_core.c +++ b/drivers/iio/common/st_sensors/st_sensors_core.c @@ -234,8 +234,6 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev, struct st_sensor_data *sdata = iio_priv(indio_dev); int err = 0; - mutex_init(&sdata->tb.buf_lock); - if (pdata) err = st_sensors_set_drdy_int_pin(indio_dev, pdata); diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c index f607a5785..796138ef7 100644 --- a/drivers/iio/gyro/st_gyro_core.c +++ b/drivers/iio/gyro/st_gyro_core.c @@ -309,6 +309,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev, indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->info = &gyro_info; + mutex_init(&gdata->tb.buf_lock); err = st_sensors_check_device_support(indio_dev, ARRAY_SIZE(st_gyro_sensors), st_gyro_sensors); diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c index 435c8ed1b..b7b000d1e 100644 --- a/drivers/iio/magnetometer/st_magn_core.c +++ b/drivers/iio/magnetometer/st_magn_core.c @@ -361,6 +361,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev, indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->info = &magn_info; + mutex_init(&mdata->tb.buf_lock); err = st_sensors_check_device_support(indio_dev, ARRAY_SIZE(st_magn_sensors), st_magn_sensors); |