Commit bc84cff2 authored May 10, 2020 by Christophe JAILLET Committed by Chanwoo Choi May 29, 2020

extcon: adc-jack: Fix an error handling path in 'adc_jack_probe()'



In some error handling paths, a call to 'iio_channel_get()' is not balanced
by a corresponding call to 'iio_channel_release()'.

This can be achieved easily by using the devm_ variant of
'iio_channel_get()'.

This has the extra benefit to simplify the remove function.

Fixes: 19939860 ("extcon: adc_jack: adc-jack driver to support 3.5 pi or simliar devices")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

parent 1fa80f18

drivers/extcon/extcon-adc-jack.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ static int adc_jack_probe(struct platform_device *pdev)
		for (i = 0; data->adc_conditions[i].id != EXTCON_NONE; i++);
		data->num_conditions = i;

		data->chan = iio_channel_get(&pdev->dev, pdata->consumer_channel);
		data->chan = devm_iio_channel_get(&pdev->dev, pdata->consumer_channel);
		if (IS_ERR(data->chan))
		return PTR_ERR(data->chan);

		@@ -164,7 +164,6 @@ static int adc_jack_remove(struct platform_device *pdev)

		free_irq(data->irq, data);
		cancel_work_sync(&data->handler.work);
		iio_channel_release(data->chan);

		return 0;
		}

Admin message