浏览代码

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>
Alban Bedel 10 年之前
父节点
当前提交
8e71c04f86

+ 1 - 0
drivers/iio/accel/st_accel_core.c

@@ -546,6 +546,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
 
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &accel_info;
 	indio_dev->info = &accel_info;
+	mutex_init(&adata->tb.buf_lock);
 
 
 	st_sensors_power_enable(indio_dev);
 	st_sensors_power_enable(indio_dev);
 
 

+ 0 - 2
drivers/iio/common/st_sensors/st_sensors_core.c

@@ -304,8 +304,6 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
 	struct st_sensors_platform_data *of_pdata;
 	struct st_sensors_platform_data *of_pdata;
 	int err = 0;
 	int err = 0;
 
 
-	mutex_init(&sdata->tb.buf_lock);
-
 	/* If OF/DT pdata exists, it will take precedence of anything else */
 	/* If OF/DT pdata exists, it will take precedence of anything else */
 	of_pdata = st_sensors_of_probe(indio_dev->dev.parent, pdata);
 	of_pdata = st_sensors_of_probe(indio_dev->dev.parent, pdata);
 	if (of_pdata)
 	if (of_pdata)

+ 1 - 0
drivers/iio/gyro/st_gyro_core.c

@@ -400,6 +400,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev)
 
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &gyro_info;
 	indio_dev->info = &gyro_info;
+	mutex_init(&gdata->tb.buf_lock);
 
 
 	st_sensors_power_enable(indio_dev);
 	st_sensors_power_enable(indio_dev);
 
 

+ 1 - 0
drivers/iio/magnetometer/st_magn_core.c

@@ -369,6 +369,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev)
 
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &magn_info;
 	indio_dev->info = &magn_info;
+	mutex_init(&mdata->tb.buf_lock);
 
 
 	st_sensors_power_enable(indio_dev);
 	st_sensors_power_enable(indio_dev);
 
 

+ 1 - 0
drivers/iio/pressure/st_pressure_core.c

@@ -417,6 +417,7 @@ int st_press_common_probe(struct iio_dev *indio_dev)
 
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &press_info;
 	indio_dev->info = &press_info;
+	mutex_init(&press_data->tb.buf_lock);
 
 
 	st_sensors_power_enable(indio_dev);
 	st_sensors_power_enable(indio_dev);