From: Jonathan Cameron <jic23@kernel.org>
To: Jonathan Cameron <jic23@kernel.org>
Cc: linux-iio@vger.kernel.org, mirq-linux@rere.qmqm.pl
Subject: Re: [PATCH] iio:callback buffer: free the scan_mask
Date: Sun, 02 Jun 2013 16:57:40 +0100 [thread overview]
Message-ID: <51AB6B74.4090604@kernel.org> (raw)
In-Reply-To: <1369258877-7308-1-git-send-email-jic23@kernel.org>
On 05/22/2013 10:41 PM, Jonathan Cameron wrote:
> Reported-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Applied to fixes-togreg branch of iio.git
Sometimes I think no one cares, then I remember that there are no
in tree users of this code so probably no one does ;)
> ---
> As per original discussion I've now put together a minimal patch.
> The rework suggested was reasonable but had no place in a fix patch.
>
> drivers/iio/buffer_cb.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/buffer_cb.c b/drivers/iio/buffer_cb.c
> index 9201022..9d19ba7 100644
> --- a/drivers/iio/buffer_cb.c
> +++ b/drivers/iio/buffer_cb.c
> @@ -64,7 +64,7 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
> while (chan->indio_dev) {
> if (chan->indio_dev != indio_dev) {
> ret = -EINVAL;
> - goto error_release_channels;
> + goto error_free_scan_mask;
> }
> set_bit(chan->channel->scan_index,
> cb_buff->buffer.scan_mask);
> @@ -73,6 +73,8 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
>
> return cb_buff;
>
> +error_free_scan_mask:
> + kfree(cb_buff->buffer.scan_mask);
> error_release_channels:
> iio_channel_release_all(cb_buff->channels);
> error_free_cb_buff:
> @@ -100,6 +102,7 @@ EXPORT_SYMBOL_GPL(iio_channel_stop_all_cb);
>
> void iio_channel_release_all_cb(struct iio_cb_buffer *cb_buff)
> {
> + kfree(cb_buff->buffer.scan_mask);
> iio_channel_release_all(cb_buff->channels);
> kfree(cb_buff);
> }
>
prev parent reply other threads:[~2013-06-02 15:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-22 21:41 [PATCH] iio:callback buffer: free the scan_mask Jonathan Cameron
2013-06-02 15:57 ` Jonathan Cameron [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51AB6B74.4090604@kernel.org \
--to=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=mirq-linux@rere.qmqm.pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).