projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch develop-3.10
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
iio
/
common
/
st_sensors
/
st_sensors_trigger.c
diff --git
a/drivers/iio/common/st_sensors/st_sensors_trigger.c
b/drivers/iio/common/st_sensors/st_sensors_trigger.c
index 8fc3a97eb266e6302367653248017c3b6078a021..8d8ca6f1e16a5d602b182355fc1f051738dc48c2 100644
(file)
--- a/
drivers/iio/common/st_sensors/st_sensors_trigger.c
+++ b/
drivers/iio/common/st_sensors/st_sensors_trigger.c
@@
-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;
}
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;
return 0;