* [PATCH 1/2] iio: inkern: put the IIO device when it fails to allocate memory
@ 2012-09-18 4:55 ` Kim, Milo
0 siblings, 0 replies; 3+ messages in thread
From: Kim, Milo @ 2012-09-18 4:55 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Jonathan Cameron, Lars-Peter Clausen, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org
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 cons=
umer.
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@ti.com>
---
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, c=
onst char *channel_name)
=20
channel =3D kzalloc(sizeof(*channel), GFP_KERNEL);
if (channel =3D=3D NULL)
- return ERR_PTR(-ENOMEM);
+ goto error_no_mem;
=20
channel->indio_dev =3D c->indio_dev;
=20
@@ -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);
=20
--=20
1.7.9.5
Best Regards,
Milo
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/2] iio: inkern: put the IIO device when it fails to allocate memory
@ 2012-09-18 4:55 ` Kim, Milo
0 siblings, 0 replies; 3+ messages in thread
From: Kim, Milo @ 2012-09-18 4:55 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Jonathan Cameron, Lars-Peter Clausen, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org
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@ti.com>
---
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);
--
1.7.9.5
Best Regards,
Milo
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] iio: inkern: put the IIO device when it fails to allocate memory
2012-09-18 4:55 ` Kim, Milo
(?)
@ 2012-09-22 9:14 ` Jonathan Cameron
-1 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2012-09-22 9:14 UTC (permalink / raw)
To: Kim, Milo
Cc: Jonathan Cameron, Lars-Peter Clausen, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org
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@ti.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);
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-22 9:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-18 4:55 [PATCH 1/2] iio: inkern: put the IIO device when it fails to allocate memory Kim, Milo
2012-09-18 4:55 ` Kim, Milo
2012-09-22 9:14 ` Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.