diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-01 14:51:02 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-01 14:51:02 +0300 |
| commit | dce5bdfe8fc1e3b49fa6fcf21e07bb12360e1b98 (patch) | |
| tree | 0694ddd5dc9185aa5300c7c1ad32d8a6a128725e /drivers/iio/imu/adis_trigger.c | |
| parent | 3d8bbe243dc7418b4b2eadcbf5693887d076a521 (diff) | |
| parent | 4ce7ca89d6e8eae9e201cd0e972ba323f33e2fb4 (diff) | |
| download | linux-dce5bdfe8fc1e3b49fa6fcf21e07bb12360e1b98.tar.xz | |
Merge tag 'iio-fixes-for-4.0d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes:
IIO fixes for 4.0 set 4
A couple more IIO fixes.
* Fix check for HAS_IOMEM in the cc100001_adc driver to avoid build errors.
Rather curiously it was ORed with Regulator and clock support.
* vf610 driver was trying to use an ADC clock outside the possible
spec on some boards. The driver assumed a fixed clock speed previously
across all boards, but that is not true. This fix ensures that the
reported frequency is correct on all boards.
* The adis imu common code directly set the current trigger to the
driver supplied one. Unfortunately this didn't increase the use count
leading to a double free via a particular path of changing the trigger
then removing the driver.
Diffstat (limited to 'drivers/iio/imu/adis_trigger.c')
| -rw-r--r-- | drivers/iio/imu/adis_trigger.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/imu/adis_trigger.c b/drivers/iio/imu/adis_trigger.c index e0017c22bb9c..f53e9a803a0e 100644 --- a/drivers/iio/imu/adis_trigger.c +++ b/drivers/iio/imu/adis_trigger.c @@ -60,7 +60,7 @@ int adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev) iio_trigger_set_drvdata(adis->trig, adis); ret = iio_trigger_register(adis->trig); - indio_dev->trig = adis->trig; + indio_dev->trig = iio_trigger_get(adis->trig); if (ret) goto error_free_irq; |