diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 13:12:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 13:12:23 -0700 |
| commit | b4e8459947e167f326795bf3dbc06c04b2a12d1d (patch) | |
| tree | 0cdc972280461f48b3eb0d4c013f3e20bfb18564 /drivers/staging/iio | |
| parent | cb9cfd7ed3f6ed4c40167b4251cdb382b6b3ba1c (diff) | |
| parent | 10a485c55ae8d313194afc7a8c65df3ac7c048a1 (diff) | |
Merge tag 'iio-for-3.13b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
Second set of new functionality for IIO in the 3.13 cycle - with bug fixes for first set.
This is a small, mainly to get a couple of compile bug related fixes into
the tree ASAP.
New device support:
1) Add ad5446 dac support to the ad5641 driver.
New functionality and cleanups:
1) Optional power supply regulators for the st pressure sensors drivers using
the new optional regulator interface.
2) Bit of tidying up of naming in the sysfs trigger.
Bug fixes from the previous series:
1) Missing select IIO_BUFFER for ti_am335x_adc
2) Drop a bonus bracket in iio-trig-bfin-timmer
Diffstat (limited to 'drivers/staging/iio')
| -rw-r--r-- | drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c index ebb189c68d88..26e1ca0b7800 100644 --- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c +++ b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c @@ -91,7 +91,7 @@ static ssize_t iio_bfin_tmr_frequency_store(struct device *dev, if (ret) return ret; - if (val > 100000) { + if (val > 100000) return -EINVAL; enabled = get_enabled_gptimers() & st->t->bit; |