Skip to content

Commit 27b2ed5

Browse files
Jiakai Luojic23
authored andcommitted
iio: adc: mxs-lradc: fix the order of two cleanup operations
Smatch reports: drivers/iio/adc/mxs-lradc-adc.c:766 mxs_lradc_adc_probe() warn: missing unwind goto? the order of three init operation: 1.mxs_lradc_adc_trigger_init 2.iio_triggered_buffer_setup 3.mxs_lradc_adc_hw_init thus, the order of three cleanup operation should be: 1.mxs_lradc_adc_hw_stop 2.iio_triggered_buffer_cleanup 3.mxs_lradc_adc_trigger_remove we exchange the order of two cleanup operations, introducing the following differences: 1.if mxs_lradc_adc_trigger_init fails, returns directly; 2.if trigger_init succeeds but iio_triggered_buffer_setup fails, goto err_trig and remove the trigger. In addition, we also reorder the unwind that goes on in the remove() callback to match the new ordering. Fixes: 6dd112b ("iio: adc: mxs-lradc: Add support for ADC driver") Signed-off-by: Jiakai Luo <jkluo@hust.edu.cn> Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn> Link: https://lore.kernel.org/r/20230422133407.72908-1-jkluo@hust.edu.cn Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
1 parent 28f73de commit 27b2ed5

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/iio/adc/mxs-lradc-adc.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -757,13 +757,13 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
757757

758758
ret = mxs_lradc_adc_trigger_init(iio);
759759
if (ret)
760-
goto err_trig;
760+
return ret;
761761

762762
ret = iio_triggered_buffer_setup(iio, &iio_pollfunc_store_time,
763763
&mxs_lradc_adc_trigger_handler,
764764
&mxs_lradc_adc_buffer_ops);
765765
if (ret)
766-
return ret;
766+
goto err_trig;
767767

768768
adc->vref_mv = mxs_lradc_adc_vref_mv[lradc->soc];
769769

@@ -801,9 +801,9 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
801801

802802
err_dev:
803803
mxs_lradc_adc_hw_stop(adc);
804-
mxs_lradc_adc_trigger_remove(iio);
805-
err_trig:
806804
iio_triggered_buffer_cleanup(iio);
805+
err_trig:
806+
mxs_lradc_adc_trigger_remove(iio);
807807
return ret;
808808
}
809809

@@ -814,8 +814,8 @@ static int mxs_lradc_adc_remove(struct platform_device *pdev)
814814

815815
iio_device_unregister(iio);
816816
mxs_lradc_adc_hw_stop(adc);
817-
mxs_lradc_adc_trigger_remove(iio);
818817
iio_triggered_buffer_cleanup(iio);
818+
mxs_lradc_adc_trigger_remove(iio);
819819

820820
return 0;
821821
}

0 commit comments

Comments
 (0)