[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <505D8168.8000003@kernel.org>
Date: Sat, 22 Sep 2012 10:14:16 +0100
From: Jonathan Cameron <jic23@...nel.org>
To: "Kim, Milo" <Milo.Kim@...com>
CC: Jonathan Cameron <jic23@....ac.uk>,
Lars-Peter Clausen <lars@...afoo.de>,
"linux-iio@...r.kernel.org" <linux-iio@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 1/2] iio: inkern: put the IIO device when it fails to
allocate memory
On 09/18/2012 05:55 AM, Kim, Milo wrote:
> The reference count of the IIO device is increased if the IIO map has
> matched consumer name.
> After then, it tries to allocate the iio_channel which is used by the consumer.
> If it fails to allocate memory, the reference count should be decreased.
>
> This patch enables restoring the reference count of the IIO device.
>
> Signed-off-by: Milo(Woogyom) Kim <milo.kim@...com>
Thanks add to togreg branch of iio.git
> ---
> drivers/iio/inkern.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
> index 13748c0..aff034b 100644
> --- a/drivers/iio/inkern.c
> +++ b/drivers/iio/inkern.c
> @@ -132,7 +132,7 @@ struct iio_channel *iio_channel_get(const char *name, const char *channel_name)
>
> channel = kzalloc(sizeof(*channel), GFP_KERNEL);
> if (channel == NULL)
> - return ERR_PTR(-ENOMEM);
> + goto error_no_mem;
>
> channel->indio_dev = c->indio_dev;
>
> @@ -151,6 +151,9 @@ error_no_chan:
> iio_device_put(c->indio_dev);
> kfree(channel);
> return ERR_PTR(-EINVAL);
> +error_no_mem:
> + iio_device_put(c->indio_dev);
> + return ERR_PTR(-ENOMEM);
> }
> EXPORT_SYMBOL_GPL(iio_channel_get);
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists