Skip to contentSkip to conversation

iio: adc: max1027: fix not unregistered iio trigger

PATCH In review Chuhong Yuan 2 participants 2 messages Nov 18, 2019 – Nov 23, 2019 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: adc: max1027: fix not unregistered iio trigger

The driver forgets to unregister the iio trigger in probe failure and remove.
Use devm API to fix it.

---
 drivers/iio/adc/max1027.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/iio/adc/max1027.c +6 -1
index 214883458582..8caead7dffa5 100644
@@ -446,7 +446,12 @@ static int max1027_probe(struct spi_device *spi)
 	st->trig->ops = &max1027_trigger_ops;
 	st->trig->dev.parent = &spi->dev;
 	iio_trigger_set_drvdata(st->trig, indio_dev);
-	iio_trigger_register(st->trig);
+
+	ret = devm_iio_trigger_register(&spi->dev, st->trig);
+	if (ret < 0) {
+		dev_err(&indio_dev->dev, "Failed to register iio trigger\n");
+		return ret;
+	}
 
 	ret = devm_request_threaded_irq(&spi->dev, spi->irq,
 					iio_trigger_generic_data_rdy_poll,
Signature · 1 line
2.24.0
maintainer
#1 lore raw
Quoted 5 lines · On Mon, 18 Nov 2019 19:40:18 +0800 Chuhong Yuan <[email protected]> wrote:

The driver forgets to unregister the iio trigger in probe failure and remove.
Use devm API to fix it.

Hi.

This has crossed with some other patches to the driver, but the fix is still applicable. If we want to push this back to older stable branches we will need to do manual backports.

Adjusted version applied to the fixes-togreg branch of iio.git.

Thanks,

Jonathan

Quoted 22 lines
---
 drivers/iio/adc/max1027.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/iio/adc/max1027.c +6 -1
index 214883458582..8caead7dffa5 100644
@@ -446,7 +446,12 @@ static int max1027_probe(struct spi_device *spi)
 	st->trig->ops = &max1027_trigger_ops;
 	st->trig->dev.parent = &spi->dev;
 	iio_trigger_set_drvdata(st->trig, indio_dev);
-	iio_trigger_register(st->trig);
+
+	ret = devm_iio_trigger_register(&spi->dev, st->trig);
+	if (ret < 0) {
+		dev_err(&indio_dev->dev, "Failed to register iio trigger\n");
+		return ret;
+	}
 
 	ret = devm_request_threaded_irq(&spi->dev, spi->irq,
 					iio_trigger_generic_data_rdy_poll,