mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge 4.8-rc6 into staging-next
We need the IIO changes in here for future patches to build on. Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
8473054e4d
171 changed files with 1050 additions and 666 deletions
|
|
@ -456,7 +456,7 @@ int main(int argc, char **argv)
|
|||
|
||||
if (notrigger) {
|
||||
printf("trigger-less mode selected\n");
|
||||
} if (trig_num >= 0) {
|
||||
} else if (trig_num >= 0) {
|
||||
char *trig_dev_name;
|
||||
ret = asprintf(&trig_dev_name, "%strigger%d", iio_dir, trig_num);
|
||||
if (ret < 0) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue