diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-22 18:30:03 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-22 18:30:03 +0400 |
| commit | d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a (patch) | |
| tree | ea756d49395ac4a08d6cdff98d74e60384a322a6 /drivers/iio/gyro | |
| parent | 3f76a4ea5383ba2f9e76f9625f77ff246907a134 (diff) | |
| parent | 0f33be009b89d2268e94194dc4fd01a7851b6d51 (diff) | |
| download | linux-d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a.tar.xz | |
Merge 3.17-rc6 into staging-next.
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>
Diffstat (limited to 'drivers/iio/gyro')
| -rw-r--r-- | drivers/iio/gyro/itg3200_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/gyro/itg3200_buffer.c b/drivers/iio/gyro/itg3200_buffer.c index e3b3c5084070..eef50e91f17c 100644 --- a/drivers/iio/gyro/itg3200_buffer.c +++ b/drivers/iio/gyro/itg3200_buffer.c @@ -132,7 +132,7 @@ int itg3200_probe_trigger(struct iio_dev *indio_dev) goto error_free_irq; /* select default trigger */ - indio_dev->trig = st->trig; + indio_dev->trig = iio_trigger_get(st->trig); return 0; |