diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2017-08-14 13:35:22 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2017-08-14 13:35:22 -0700 |
| commit | 8652892ed44914edfb488c280ccf79301fd89117 (patch) | |
| tree | 16b49cb72d4962742855ae639a82c393cbf4c158 /drivers/iio/light | |
| parent | staging: wlan-ng: Fix the types of the hfa384x_comm_tallies_16/32 members (diff) | |
| parent | Linux 4.13-rc5 (diff) | |
| download | linux-8652892ed44914edfb488c280ccf79301fd89117.tar.gz linux-8652892ed44914edfb488c280ccf79301fd89117.tar.bz2 linux-8652892ed44914edfb488c280ccf79301fd89117.zip | |
Merge 4.13-rc5 into staging-next
We need it here for iio fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/light')
| -rw-r--r-- | drivers/iio/light/tsl2563.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index e7d4ea75e007..7599693f7fe9 100644 --- a/drivers/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c @@ -626,7 +626,7 @@ static irqreturn_t tsl2563_event_handler(int irq, void *private) struct tsl2563_chip *chip = iio_priv(dev_info); iio_push_event(dev_info, - IIO_UNMOD_EVENT_CODE(IIO_LIGHT, + IIO_UNMOD_EVENT_CODE(IIO_INTENSITY, 0, IIO_EV_TYPE_THRESH, IIO_EV_DIR_EITHER), |