diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-18 09:29:27 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-18 09:29:27 +0200 |
commit | 22d4f9beaf32a7cda9edeafdf5e99bec3de32c51 (patch) | |
tree | 37fd192452ba853e740d4b8c3fa0f171dc2b8d33 /drivers/iio/adc/aspeed_adc.c | |
parent | nvmem: imx-ocotp: add support for post processing (diff) | |
parent | Linux 5.15-rc6 (diff) | |
download | linux-22d4f9beaf32a7cda9edeafdf5e99bec3de32c51.tar.xz linux-22d4f9beaf32a7cda9edeafdf5e99bec3de32c51.zip |
Merge 5.15-rc6 into char-misc-next
We need the char/misc fixes in here for merging and testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/adc/aspeed_adc.c')
-rw-r--r-- | drivers/iio/adc/aspeed_adc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c index 19efaa41bc34..34ec0c28b2df 100644 --- a/drivers/iio/adc/aspeed_adc.c +++ b/drivers/iio/adc/aspeed_adc.c @@ -183,6 +183,7 @@ static int aspeed_adc_probe(struct platform_device *pdev) data = iio_priv(indio_dev); data->dev = &pdev->dev; + platform_set_drvdata(pdev, indio_dev); data->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(data->base)) |