* [PATCH] IIO-onwards: ADC: free pollfunc->name on remove
@ 2011-04-19 7:19 michael.hennerich
2011-04-19 10:58 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: michael.hennerich @ 2011-04-19 7:19 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, drivers, device-drivers-devel, Michael Hennerich
From: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
---
drivers/staging/iio/adc/ad7476_ring.c | 2 +-
drivers/staging/iio/adc/max1363_ring.c | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c
index b6da824..de6006b 100644
--- a/drivers/staging/iio/adc/ad7476_ring.c
+++ b/drivers/staging/iio/adc/ad7476_ring.c
@@ -109,7 +109,6 @@ done:
return IRQ_HANDLED;
}
-
static struct iio_ring_setup_ops ad7476_ring_setup_ops = {
.preenable = &ad7476_ring_preenable,
.postenable = &iio_triggered_ring_postenable,
@@ -168,6 +167,7 @@ void ad7476_ring_cleanup(struct iio_dev *indio_dev)
iio_trigger_dettach_poll_func(indio_dev->trig,
indio_dev->pollfunc);
}
+ kfree(indio_dev->pollfunc->name);
kfree(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring);
}
diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
index b8054be..da6b4f6 100644
--- a/drivers/staging/iio/adc/max1363_ring.c
+++ b/drivers/staging/iio/adc/max1363_ring.c
@@ -210,6 +210,7 @@ void max1363_ring_cleanup(struct iio_dev *indio_dev)
iio_trigger_dettach_poll_func(indio_dev->trig,
indio_dev->pollfunc);
}
+ kfree(indio_dev->pollfunc->name);
kfree(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring);
}
--
1.6.0.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] IIO-onwards: ADC: free pollfunc->name on remove
2011-04-19 7:19 [PATCH] IIO-onwards: ADC: free pollfunc->name on remove michael.hennerich
@ 2011-04-19 10:58 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2011-04-19 10:58 UTC (permalink / raw)
To: michael.hennerich; +Cc: linux-iio, drivers, device-drivers-devel
On 04/19/11 08:19, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
>
>
Thanks, will merge fixes into the patches that introduced the bug.
> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
> ---
> drivers/staging/iio/adc/ad7476_ring.c | 2 +-
> drivers/staging/iio/adc/max1363_ring.c | 1 +
> 2 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c
> index b6da824..de6006b 100644
> --- a/drivers/staging/iio/adc/ad7476_ring.c
> +++ b/drivers/staging/iio/adc/ad7476_ring.c
> @@ -109,7 +109,6 @@ done:
> return IRQ_HANDLED;
> }
>
> -
> static struct iio_ring_setup_ops ad7476_ring_setup_ops = {
> .preenable = &ad7476_ring_preenable,
> .postenable = &iio_triggered_ring_postenable,
> @@ -168,6 +167,7 @@ void ad7476_ring_cleanup(struct iio_dev *indio_dev)
> iio_trigger_dettach_poll_func(indio_dev->trig,
> indio_dev->pollfunc);
> }
> + kfree(indio_dev->pollfunc->name);
> kfree(indio_dev->pollfunc);
> iio_sw_rb_free(indio_dev->ring);
> }
> diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
> index b8054be..da6b4f6 100644
> --- a/drivers/staging/iio/adc/max1363_ring.c
> +++ b/drivers/staging/iio/adc/max1363_ring.c
> @@ -210,6 +210,7 @@ void max1363_ring_cleanup(struct iio_dev *indio_dev)
> iio_trigger_dettach_poll_func(indio_dev->trig,
> indio_dev->pollfunc);
> }
> + kfree(indio_dev->pollfunc->name);
> kfree(indio_dev->pollfunc);
> iio_sw_rb_free(indio_dev->ring);
> }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-19 10:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-19 7:19 [PATCH] IIO-onwards: ADC: free pollfunc->name on remove michael.hennerich
2011-04-19 10:58 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox