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/common | |
| 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/common')
| -rw-r--r-- | drivers/iio/common/hid-sensors/hid-sensor-trigger.c | 3 | ||||
| -rw-r--r-- | drivers/iio/common/st_sensors/st_sensors_trigger.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c index a3109a6f4d86..92068cdbf8c7 100644 --- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c +++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c @@ -122,7 +122,8 @@ int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name, dev_err(&indio_dev->dev, "Trigger Register Failed\n"); goto error_free_trig; } - indio_dev->trig = attrb->trigger = trig; + attrb->trigger = trig; + indio_dev->trig = iio_trigger_get(trig); return ret; diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c index 8fc3a97eb266..8d8ca6f1e16a 100644 --- 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; } - indio_dev->trig = sdata->trig; + indio_dev->trig = iio_trigger_get(sdata->trig); return 0; |