diff options
| author | Alexandru Ardelean <alexandru.ardelean@analog.com> | 2020-07-21 13:24:07 +0300 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2020-07-22 14:36:23 +0100 |
| commit | 8525df47b3d1eaa9a2206964f63f71a2f48dc7c1 (patch) | |
| tree | c225fa1ed6df9941e33e402bb06100cc56a59f74 /drivers/iio | |
| parent | 951ad4700313984a45c95a33ec6abba6b3054525 (diff) | |
| download | linux-8525df47b3d1eaa9a2206964f63f71a2f48dc7c1.tar.gz | |
iio: core: fix/re-introduce back parent assignment
This was introduced initially via commit 78289b4a58b58 ("iio: core: pass
parent device as parameter during allocation"), but was accidentally
removed via commit 6d4ebd565d15f ("iio: core: wrap IIO device into an
iio_dev_opaque object").
This looks like a rebase gone wrong, and ends up breaking devicetree
bindings of IIO clients.
This change adds back the parent assignment.
Fixes 6d4ebd565d15f: ("iio: core: wrap IIO device into an iio_dev_opaque object")
Reported-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Tested-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/industrialio-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index e6ecda27a8bc..606d5e61c575 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1545,6 +1545,7 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv) dev->priv = (char *)iio_dev_opaque + ALIGN(sizeof(struct iio_dev_opaque), IIO_ALIGN); + dev->dev.parent = parent; dev->dev.groups = dev->groups; dev->dev.type = &iio_device_type; dev->dev.bus = &iio_bus_type; |