diff options
| author | Greg Kroah-Hartman | 2017-10-23 14:29:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-10-23 14:29:43 +0200 |
| commit | 7706abf5a0eb4c082897fd2a17a0ac0898e39666 (patch) | |
| tree | 982d22365f1aeedc43a796ef816cf1b1fa8480a7 /drivers/iio/dummy | |
| parent | staging: vc04_services: Remove unnecessary braces (diff) | |
| parent | Linux 4.14-rc6 (diff) | |
| download | kernel-qcow2-linux-7706abf5a0eb4c082897fd2a17a0ac0898e39666.tar.gz kernel-qcow2-linux-7706abf5a0eb4c082897fd2a17a0ac0898e39666.tar.xz kernel-qcow2-linux-7706abf5a0eb4c082897fd2a17a0ac0898e39666.zip | |
Merge 4.14-rc6 into staging-next
We want the IIO and staging driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/dummy')
| -rw-r--r-- | drivers/iio/dummy/iio_simple_dummy_events.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/dummy/iio_simple_dummy_events.c b/drivers/iio/dummy/iio_simple_dummy_events.c index ed63ffd849f8..7ec2a0bb0807 100644 --- a/drivers/iio/dummy/iio_simple_dummy_events.c +++ b/drivers/iio/dummy/iio_simple_dummy_events.c @@ -72,6 +72,7 @@ int iio_simple_dummy_write_event_config(struct iio_dev *indio_dev, st->event_en = state; else return -EINVAL; + break; default: return -EINVAL; } |