Commit f60c4a02 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio: prevent removal of module connected to trigger. 



Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e65bc6ac

drivers/staging/iio/adc/ad7192.c

+0 −6
Original line number Diff line number Diff line
@@ -605,12 +605,6 @@ error_ret: 


static void ad7192_ring_cleanup(struct iio_dev *indio_dev)

{

	/* ensure that the trigger has been detached */

	if (indio_dev->trig) {

		iio_put_trigger(indio_dev->trig);

		iio_trigger_dettach_poll_func(indio_dev->trig,

					      indio_dev->pollfunc);

	}

	iio_dealloc_pollfunc(indio_dev->pollfunc);

	iio_sw_rb_free(indio_dev->ring);

}

drivers/staging/iio/adc/ad7298_ring.c

+0 −5
Original line number Diff line number Diff line
@@ -189,11 +189,6 @@ error_ret: 


void ad7298_ring_cleanup(struct iio_dev *indio_dev)

{

	if (indio_dev->trig) {

		iio_put_trigger(indio_dev->trig);

		iio_trigger_dettach_poll_func(indio_dev->trig,

					      indio_dev->pollfunc);

	}

	iio_dealloc_pollfunc(indio_dev->pollfunc);

	iio_sw_rb_free(indio_dev->ring);

}

drivers/staging/iio/adc/ad7476_ring.c

+0 −6
Original line number Diff line number Diff line
@@ -152,12 +152,6 @@ error_ret: 


void ad7476_ring_cleanup(struct iio_dev *indio_dev)

{

	/* ensure that the trigger has been detached */

	if (indio_dev->trig) {

		iio_put_trigger(indio_dev->trig);

		iio_trigger_dettach_poll_func(indio_dev->trig,

					      indio_dev->pollfunc);

	}

	iio_dealloc_pollfunc(indio_dev->pollfunc);

	iio_sw_rb_free(indio_dev->ring);

}

drivers/staging/iio/adc/ad7606_ring.c

+0 −5
Original line number Diff line number Diff line
@@ -197,11 +197,6 @@ error_ret: 


void ad7606_ring_cleanup(struct iio_dev *indio_dev)

{

	if (indio_dev->trig) {

		iio_put_trigger(indio_dev->trig);

		iio_trigger_dettach_poll_func(indio_dev->trig,

					      indio_dev->pollfunc);

	}

	iio_dealloc_pollfunc(indio_dev->pollfunc);

	iio_sw_rb_free(indio_dev->ring);

}

drivers/staging/iio/adc/ad7793.c

+0 −6
Original line number Diff line number Diff line
@@ -469,12 +469,6 @@ error_ret: 


static void ad7793_ring_cleanup(struct iio_dev *indio_dev)

{

	/* ensure that the trigger has been detached */

	if (indio_dev->trig) {

		iio_put_trigger(indio_dev->trig);

		iio_trigger_dettach_poll_func(indio_dev->trig,

					      indio_dev->pollfunc);

	}

	iio_dealloc_pollfunc(indio_dev->pollfunc);

	iio_sw_rb_free(indio_dev->ring);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE