[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <A874F61F95741C4A9BA573A70FE3998F41EF5397@DQHE02.ent.ti.com>
Date: Tue, 18 Sep 2012 04:55:53 +0000
From: "Kim, Milo" <Milo.Kim@...com>
To: Jonathan Cameron <jic23@...nel.org>
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: [PATCH 1/2] iio: inkern: put the IIO device when it fails to
allocate memory
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>
---
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@...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