diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-27 11:03:28 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-27 11:03:28 +0300 |
| commit | e6aa42f93751e4d9ac8505b7ac57acd5506bdec9 (patch) | |
| tree | 3bdbb589c7e0abeb111cdd142f647fd21c762355 /drivers/iio/chemical/ccs811.c | |
| parent | 508aeb54e4f0225f4ff3da9b7ec8ac44ce30aad8 (diff) | |
| parent | 03c765b0e3b4cb5063276b086c76f7a612856a9a (diff) | |
| download | linux-e6aa42f93751e4d9ac8505b7ac57acd5506bdec9.tar.xz | |
Merge 5.19-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/chemical/ccs811.c')
| -rw-r--r-- | drivers/iio/chemical/ccs811.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iio/chemical/ccs811.c b/drivers/iio/chemical/ccs811.c index 847194fa1e46..80ef1aa9aae3 100644 --- a/drivers/iio/chemical/ccs811.c +++ b/drivers/iio/chemical/ccs811.c @@ -499,11 +499,11 @@ static int ccs811_probe(struct i2c_client *client, data->drdy_trig->ops = &ccs811_trigger_ops; iio_trigger_set_drvdata(data->drdy_trig, indio_dev); - indio_dev->trig = data->drdy_trig; - iio_trigger_get(indio_dev->trig); ret = iio_trigger_register(data->drdy_trig); if (ret) goto err_poweroff; + + indio_dev->trig = iio_trigger_get(data->drdy_trig); } ret = iio_triggered_buffer_setup(indio_dev, NULL, |