xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 4.1-rc4 into staging-next

Browse Source 
We want the fixes in here for testing and merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2015-05-18 13:52:44 -07:00
parent 36bf51acc8 e26081808e
commit 936a0cd52a
548 changed files with 6086 additions and 4854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iio/common/st_sensors/st_sensors_core.c
View File

@@ -314,8 +314,6 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
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)