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 30554026a7fe8d9d0380e2a0ab9b201291e01263..df67b63ccf69ca3fa0175cfbd43dccb405702df8 100644 (file)
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -1409,7 +1409,7 @@ static struct iio_trigger *at91_adc_allocate_trigger(struct iio_dev *indio,
        trig = devm_iio_trigger_alloc(&indio->dev, "%s-dev%d-%s", indio->name,
                                iio_device_id(indio), trigger_name);
        if (!trig)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        trig->dev.parent = indio->dev.parent;
        iio_trigger_set_drvdata(trig, indio);