Merge tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-block.git] / drivers / iio / adc / at91-sama5d2_adc.c

diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
index 7258912fe17b758f279de776b420c206ed313f4a..df67b63ccf69ca3fa0175cfbd43dccb405702df8 100644 (file)
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -1194,7 +1194,7 @@ static void at91_dma_buffer_done(void *data)
 {
        struct iio_dev *indio_dev = data;
 
-       iio_trigger_poll_chained(indio_dev->trig);
+       iio_trigger_poll_nested(indio_dev->trig);
 }
 
 static int at91_adc_dma_start(struct iio_dev *indio_dev)
@@ -2400,12 +2400,8 @@ static int at91_adc_probe(struct platform_device *pdev)
        st->dma_st.phys_addr = res->start;
 
        st->irq = platform_get_irq(pdev, 0);
-       if (st->irq <= 0) {
-               if (!st->irq)
-                       st->irq = -ENXIO;
-
+       if (st->irq < 0)
                return st->irq;
-       }
 
        st->per_clk = devm_clk_get(&pdev->dev, "adc_clk");
        if (IS_ERR(st->per_clk))