Re: [PATCH] IIO-onwards: ADC: free pollfunc->name on remove

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 04/19/11 08:19, michael.hennerich@xxxxxxxxxx wrote:
> From: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
> 
> 
Thanks, will merge fixes into the patches that introduced the bug.

> Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
> ---
>  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);
>  }

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Input]     [Linux Kernel]     [Linux SCSI]     [X.org]

  Powered by Linux