Skip to contentSkip to conversation

Patch "iio:st_sensors: Fix oops when probing SPI devices" has been added to the 4.0-stable tree

PATCH [email protected] 1 participant 1 message Jun 3, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

iio:st_sensors: Fix oops when probing SPI devices

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
iio-st_sensors-fix-oops-when-probing-spi-devices.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 8e71c04f863a1754f21b27fb8ecb773d680a0a80 Mon Sep 17 00:00:00 2001

From: Alban Bedel <[email protected]>
Date: Mon, 20 Apr 2015 13:57:18 +0200
Subject: iio:st_sensors: Fix oops when probing SPI devices

From: Alban Bedel <[email protected]>

commit 8e71c04f863a1754f21b27fb8ecb773d680a0a80 upstream.

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.

---
 drivers/iio/accel/st_accel_core.c               |    1 +
 drivers/iio/common/st_sensors/st_sensors_core.c |    2 --
 drivers/iio/gyro/st_gyro_core.c                 |    1 +
 drivers/iio/magnetometer/st_magn_core.c         |    1 +
 drivers/iio/pressure/st_pressure_core.c         |    1 +
 5 files changed, 4 insertions(+), 2 deletions(-)
drivers/iio/accel/st_accel_core.c +1 -0
@@ -465,6 +465,7 @@ int st_accel_common_probe(struct iio_dev
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &accel_info;
+	mutex_init(&adata->tb.buf_lock);
 
 	st_sensors_power_enable(indio_dev);
 
drivers/iio/common/st_sensors/st_sensors_core.c +0 -2
@@ -304,8 +304,6 @@ int st_sensors_init_sensor(struct iio_de
 	struct st_sensors_platform_data *of_pdata;
 	int err = 0;
 
-	mutex_init(&sdata->tb.buf_lock);
-
 	/* If OF/DT pdata exists, it will take precedence of anything else */
 	of_pdata = st_sensors_of_probe(indio_dev->dev.parent, pdata);
 	if (of_pdata)
drivers/iio/gyro/st_gyro_core.c +1 -0
@@ -317,6 +317,7 @@ int st_gyro_common_probe(struct iio_dev
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &gyro_info;
+	mutex_init(&gdata->tb.buf_lock);
 
 	st_sensors_power_enable(indio_dev);
 
drivers/iio/magnetometer/st_magn_core.c +1 -0
@@ -369,6 +369,7 @@ int st_magn_common_probe(struct iio_dev
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &magn_info;
+	mutex_init(&mdata->tb.buf_lock);
 
 	st_sensors_power_enable(indio_dev);
 
drivers/iio/pressure/st_pressure_core.c +1 -0
@@ -417,6 +417,7 @@ int st_press_common_probe(struct iio_dev
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &press_info;
+	mutex_init(&press_data->tb.buf_lock);
 
 	st_sensors_power_enable(indio_dev);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/iio-st_sensors-fix-oops-when-probing-spi-devices.patch