Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / iio / adc / hi8435.c

diff --git a/drivers/iio/adc/hi8435.c b/drivers/iio/adc/hi8435.c
index c73c6c62a6aca39e8b6ccebc7128719320f4f4b5..678e8c7ea7633afb0dacbdca89863fb009a8847c 100644 (file)
--- a/drivers/iio/adc/hi8435.c
+++ b/drivers/iio/adc/hi8435.c
@@ -400,7 +400,7 @@ static void hi8435_iio_push_event(struct iio_dev *idev, unsigned int val)
                        iio_push_event(idev,
                                       IIO_UNMOD_EVENT_CODE(IIO_VOLTAGE, i,
                                                    IIO_EV_TYPE_THRESH, dir),
-                                      iio_get_time_ns());
+                                      iio_get_time_ns(idev));
                }
        }
 
@@ -455,6 +455,7 @@ static int hi8435_probe(struct spi_device *spi)
        mutex_init(&priv->lock);
 
        idev->dev.parent        = &spi->dev;
+       idev->dev.of_node       = spi->dev.of_node;
        idev->name              = spi_get_device_id(spi)->name;
        idev->modes             = INDIO_DIRECT_MODE;
        idev->info              = &hi8435_info;