diff options
author | Kees Cook <keescook@chromium.org> | 2016-07-25 22:50:36 +0200 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2016-07-25 22:50:36 +0200 |
commit | 74e630a7582e6b3cb39559d712a0049f08dea8a0 (patch) | |
tree | 98a752412dcfc74d802024c1d9e8c541b93174f9 /drivers/iio/light/apds9960.c | |
parent | pstore/ram: add Device Tree bindings (diff) | |
parent | Linux 4.7 (diff) | |
download | linux-74e630a7582e6b3cb39559d712a0049f08dea8a0.tar.xz linux-74e630a7582e6b3cb39559d712a0049f08dea8a0.zip |
Merge tag 'v4.7' into for-linus/pstore
Linux 4.7
Diffstat (limited to 'drivers/iio/light/apds9960.c')
-rw-r--r-- | drivers/iio/light/apds9960.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c index b4dbb3912977..651d57b8abbf 100644 --- a/drivers/iio/light/apds9960.c +++ b/drivers/iio/light/apds9960.c @@ -1011,6 +1011,7 @@ static int apds9960_probe(struct i2c_client *client, iio_device_attach_buffer(indio_dev, buffer); + indio_dev->dev.parent = &client->dev; indio_dev->info = &apds9960_info; indio_dev->name = APDS9960_DRV_NAME; indio_dev->channels = apds9960_channels; |