Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0ef6db7 authored by Fabio Estevam's avatar Fabio Estevam Committed by Jonathan Cameron
Browse files

iio: mxs-lradc: Fix the order of resources removal 



Fix the order of resources removal in the error path of mxs_lradc_probe()
and also in mxs_lradc_remove().

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent e5e26dd5

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

+5 −5
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ static int mxs_lradc_probe(struct platform_device *pdev) 
	/* Register the touchscreen input device. */

	ret = mxs_lradc_ts_register(lradc);

	if (ret)

		goto err_dev;

		goto err_ts_register;



	/* Register IIO device. */

	ret = iio_device_register(iio);
@@ -1000,6 +1000,8 @@ static int mxs_lradc_probe(struct platform_device *pdev) 


err_ts:

	mxs_lradc_ts_unregister(lradc);

err_ts_register:

	mxs_lradc_hw_stop(lradc);

err_dev:

	mxs_lradc_trigger_remove(iio);

err_trig:
@@ -1012,13 +1014,11 @@ static int mxs_lradc_remove(struct platform_device *pdev) 
	struct iio_dev *iio = platform_get_drvdata(pdev);

	struct mxs_lradc *lradc = iio_priv(iio);



	iio_device_unregister(iio);

	mxs_lradc_ts_unregister(lradc);



	mxs_lradc_hw_stop(lradc);



	iio_device_unregister(iio);

	iio_triggered_buffer_cleanup(iio);

	mxs_lradc_trigger_remove(iio);

	iio_triggered_buffer_cleanup(iio);



	return 0;

}