diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-27 01:05:25 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-27 01:05:25 (GMT) |
commit | 02c34ccc1d2d528d2de2897881b97933363432b5 (patch) | |
tree | 8d1f53965b2c828a11066759cbe2797a4c54cf4d /drivers/staging/iio | |
parent | 35ea984daccc60e6b9dd90074bb2f4f6b57e6309 (diff) | |
parent | e8aab48b34d3bd069dfcf4ccb8f13ba8c98f7845 (diff) | |
download | linux-02c34ccc1d2d528d2de2897881b97933363432b5.tar.xz |
Merge tag 'iio-for-4.5c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
Third set of new stuff for IIO in the 4.5 cycle.
New driver features
- us5182
* Add interrupt support and rising / falling threshold events.
Cleanups / fixes to new stuff / minor additions
* Expose the IIO value formatting function for drivers to
make use of internally.
- ina2xx
* Fix wrong channel order
* Fix incorrect reporting of endianness
* Adding documentation of ABI unique to this device
- mma8452
* Drop an unused register description
* Use an enum for the channel index to aid readability
- sca3000
* Use standard NULL comparison style
- us5182
* fix an inconsistency in status of enable (a bug with no real effect until
above patches are applied)
* refactor the read_raw function to improve maintainability / readability.
Diffstat (limited to 'drivers/staging/iio')
-rw-r--r-- | drivers/staging/iio/accel/sca3000_ring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c index 20b878d..1920dc60 100644 --- a/drivers/staging/iio/accel/sca3000_ring.c +++ b/drivers/staging/iio/accel/sca3000_ring.c @@ -48,7 +48,7 @@ static int sca3000_read_data(struct sca3000_state *st, } }; *rx_p = kmalloc(len, GFP_KERNEL); - if (*rx_p == NULL) { + if (!*rx_p) { ret = -ENOMEM; goto error_ret; } |