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

Merge 3.17-rc6 into staging-next.

Browse Source 
We want the fixes in there, and it resolves a merge issue with
drivers/iio/accel/bma180.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2014-09-22 07:30:03 -07:00
parent 3f76a4ea53 0f33be009b
commit d84a2b0d6f
167 changed files with 1078 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
dev_err(&indio_dev->dev, "failed to register iio trigger.\n");
goto iio_trigger_register_error;
}
indio_dev->trig = sdata->trig;
indio_dev->trig = iio_trigger_get(sdata->trig);
return 0;