Skip to content

Commit

Permalink
iio: inkern: put the IIO device when it fails to allocate memory
Browse files Browse the repository at this point in the history
 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>
  • Loading branch information
Kim, Milo authored and Jonathan Cameron committed Sep 22, 2012
1 parent 369d0e2 commit 801c4b5
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/iio/inkern.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -151,6 +151,9 @@ struct iio_channel *iio_channel_get(const char *name, const char *channel_name)
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);

Expand Down

0 comments on commit 801c4b5

Please sign in to comment.