[PATCH 2/2] iio: inkern: put the IIO device when mem alloc getsfailed

From: Kim, Milo
Date: Mon Sep 17 2012 - 04:45:05 EST


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 memory allocation gets failed, 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@xxxxxx>
---
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


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