From: Jonathan Cameron <jic23@kernel.org>
To: "Kim, Milo" <Milo.Kim@ti.com>
Cc: Jonathan Cameron <jic23@cam.ac.uk>,
Lars-Peter Clausen <lars@metafoo.de>,
"linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/2] iio: inkern: add error case in iio_channel_get()
Date: Mon, 17 Sep 2012 19:21:42 +0100 [thread overview]
Message-ID: <50576A36.3050202@kernel.org> (raw)
In-Reply-To: <A874F61F95741C4A9BA573A70FE3998F41EF509D@DQHE02.ent.ti.com>
On 09/17/2012 09:44 AM, Kim, Milo wrote:
> The datasheet name is defined in the IIO driver.
> On the other hand, the adc_channel_label is configured in
> the platform side.
> If the datasheet name is not matched with any adc_channel_label,
> the iio_channel_get() should be returned as error for preventing
> invalid channel data access.
>
> This can be handled either way.
> (a) checking null data when using it : in the xxx_read_raw()
> or
> (b) error returns when the channel is requested : this patch
>
> The IIO consumer can't use the channel with invalid channel spec.
> Therefore case (b) is more reasonable.
>
Nicely patch, thanks.
Merged to togreg branch of
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
> Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
> ---
> drivers/iio/inkern.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
> index 1faa240..13748c0 100644
> --- a/drivers/iio/inkern.c
> +++ b/drivers/iio/inkern.c
> @@ -136,12 +136,21 @@ struct iio_channel *iio_channel_get(const char *name, const char *channel_name)
>
> channel->indio_dev = c->indio_dev;
>
> - if (c->map->adc_channel_label)
> + if (c->map->adc_channel_label) {
> channel->channel =
> iio_chan_spec_from_name(channel->indio_dev,
> c->map->adc_channel_label);
>
> + if (channel->channel == NULL)
> + goto error_no_chan;
> + }
> +
> return channel;
> +
> +error_no_chan:
> + iio_device_put(c->indio_dev);
> + kfree(channel);
> + return ERR_PTR(-EINVAL);
> }
> EXPORT_SYMBOL_GPL(iio_channel_get);
>
>
prev parent reply other threads:[~2012-09-17 18:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 8:44 [PATCH 1/2] iio: inkern: add error case in iio_channel_get() Kim, Milo
2012-09-17 18:21 ` 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=50576A36.3050202@kernel.org \
--to=jic23@kernel.org \
--cc=Milo.Kim@ti.com \
--cc=jic23@cam.ac.uk \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).