On 09/17/2012 10:44 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 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); > If you do it that way, you don't really need the goto, something like error_no_chan: kfree(channel); error_no_mem: iio_device_put(c->indio_dev); return ret would be better in my opinion. With ret being initialized in the if branch before the goto. - Lars -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
