diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-18 16:52:44 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-18 16:52:44 -0400 |
| commit | 936a0cd52aa5d024c583e36e2f21bf6ec2e527e4 (patch) | |
| tree | 01cffc11361be7d671b71ba86463f6649b39d552 /drivers/iio/common | |
| parent | 36bf51acc89d113f101e40f40af4ab53fbf5b60a (diff) | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
Merge 4.1-rc4 into staging-next
We want the fixes in here for testing and merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/common')
| -rw-r--r-- | drivers/iio/common/st_sensors/st_sensors_core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c index 1255b157c71c..e1634d2b6ae8 100644 --- a/drivers/iio/common/st_sensors/st_sensors_core.c +++ b/drivers/iio/common/st_sensors/st_sensors_core.c | |||
| @@ -314,8 +314,6 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev, | |||
| 314 | struct st_sensors_platform_data *of_pdata; | 314 | struct st_sensors_platform_data *of_pdata; |
| 315 | int err = 0; | 315 | int err = 0; |
| 316 | 316 | ||
| 317 | mutex_init(&sdata->tb.buf_lock); | ||
| 318 | |||
| 319 | /* If OF/DT pdata exists, it will take precedence of anything else */ | 317 | /* If OF/DT pdata exists, it will take precedence of anything else */ |
| 320 | of_pdata = st_sensors_of_probe(indio_dev->dev.parent, pdata); | 318 | of_pdata = st_sensors_of_probe(indio_dev->dev.parent, pdata); |
| 321 | if (of_pdata) | 319 | if (of_pdata) |