diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-09 10:43:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-09 10:43:49 +0200 |
| commit | 52e31f89cc40c613b22e62108fe12b27433a888e (patch) | |
| tree | c3cd45d6950706c32efdd341715e70b6ee6d7a5e /drivers/iio/light/apds9960.c | |
| parent | 9a7e7b571826c4399aa639af4a670642d96d935c (diff) | |
| parent | ee40fb2948fc99096836995d4f3ddcc0efbac790 (diff) | |
Merge branch 'linus' into x86/asm, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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; |