diff options
author | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:20:01 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:20:01 (GMT) |
commit | 46864e3149aabfe369f1c469951909b9dc7d53bf (patch) | |
tree | 5a57c938836d6f2853beaa123d568d128ab76349 /drivers/iio | |
parent | 63f2cd32fb5f8541636f47cc4c7c53cf8284851f (diff) | |
parent | 948a4eec975b0f231c6a55eaaff3e3bdcf4cdf70 (diff) | |
download | linux-fsl-qoriq-46864e3149aabfe369f1c469951909b9dc7d53bf.tar.xz |
Merge branch 'sdk-kernel-3.12' into sdk-v1.6.x
Diffstat (limited to 'drivers/iio')
-rw-r--r-- | drivers/iio/industrialio-event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c index 6be65ef..3431443 100644 --- a/drivers/iio/industrialio-event.c +++ b/drivers/iio/industrialio-event.c @@ -56,7 +56,7 @@ int iio_push_event(struct iio_dev *indio_dev, u64 ev_code, s64 timestamp) ev.id = ev_code; ev.timestamp = timestamp; - copied = kfifo_put(&ev_int->det_events, &ev); + copied = kfifo_put(&ev_int->det_events, ev); if (copied != 0) wake_up_locked_poll(&ev_int->wait, POLLIN); } |