iio: inkern: put the IIO device when it fails to allocate memory
authorKim, Milo <Milo.Kim@ti.com>
Tue, 18 Sep 2012 04:55:00 +0000 (05:55 +0100)
committerJonathan Cameron <jic23@kernel.org>
Sat, 22 Sep 2012 09:13:32 +0000 (10:13 +0100)
 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>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/inkern.c

index 25b00761005add0e738766f258b61ef27b7aa954..e38f41464fe4bf727bde44ffc587d730c6426efb 100644 (file)
@@ -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);