Merge tag 'nfs-for-3.15-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / drivers / iio / buffer_cb.c

diff --git a/drivers/iio/buffer_cb.c b/drivers/iio/buffer_cb.c
index 2d9c6f8c06db999017576e50c6d3e789c0f3f584..eb46e728aa2effad51dbf686cb74c4a5cb7fdf3a 100644 (file)
--- a/drivers/iio/buffer_cb.c
+++ b/drivers/iio/buffer_cb.c
@@ -46,10 +46,8 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
        struct iio_channel *chan;
 
        cb_buff = kzalloc(sizeof(*cb_buff), GFP_KERNEL);
-       if (cb_buff == NULL) {
-               ret = -ENOMEM;
-               goto error_ret;
-       }
+       if (cb_buff == NULL)
+               return ERR_PTR(-ENOMEM);
 
        iio_buffer_init(&cb_buff->buffer);
 
@@ -91,7 +89,6 @@ error_release_channels:
        iio_channel_release_all(cb_buff->channels);
 error_free_cb_buff:
        kfree(cb_buff);
-error_ret:
        return ERR_PTR(ret);
 }
 EXPORT_SYMBOL_GPL(iio_channel_get_all_cb);