Commit 8f518d71 authored by Bryan Freed's avatar Bryan Freed Committed by Greg Kroah-Hartman

iio: light sensor: Fix a panic in the tsl2563 driver.

Add a wrapper for this driver around the IIO_CHAN() wrapper to make channel
parameters more readable.  This fixes a panic caused by the info_masks being
accidentally passed in as channel2 parameters which easily surpass the size
of the iio_modifier_names_light array.
Signed-off-by: default avatarBryan Freed <bfreed@chromium.org>
Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent beeada73
......@@ -548,15 +548,16 @@ static int tsl2563_read_raw(struct iio_dev *indio_dev,
return ret;
}
#define INFO_MASK (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE)
#define EVENT_MASK (IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) | \
IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING))
#define IIO_CHAN_2563(type, mod, proc, chan, imask, emask) \
IIO_CHAN(type, mod, 1, proc, NULL, chan, 0, imask, 0, 0, {}, emask)
static const struct iio_chan_spec tsl2563_channels[] = {
IIO_CHAN(IIO_LIGHT, 0, 1, 1, NULL, 0, 0, 0, 0, 0, {}, 0),
IIO_CHAN(IIO_INTENSITY, 1, 1, 0, "both", 0,
(1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE), 0, 0, 0, {},
IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |
IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING)),
IIO_CHAN(IIO_INTENSITY, 1, 1, 0, "ir", 1,
(1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE), 0, 0, 0, {},
0)
IIO_CHAN_2563(IIO_LIGHT, 0, 1, 0, 0, 0),
IIO_CHAN_2563(IIO_INTENSITY, 1, 0, 0, INFO_MASK, EVENT_MASK),
IIO_CHAN_2563(IIO_INTENSITY, 1, 0, 1, INFO_MASK, 0),
};
static int tsl2563_read_thresh(struct iio_dev *indio_dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment