Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / iio / industrialio-event.c

diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
index 857e630..261cae0 100644 (file)
--- a/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@ -350,15 +350,10 @@ static inline int __iio_add_event_config_attrs(struct iio_dev *indio_dev)
                ret = iio_device_add_event_sysfs(indio_dev,
                                                 &indio_dev->channels[j]);
                if (ret < 0)
-                       goto error_clear_attrs;
+                       return ret;
                attrcount += ret;
        }
        return attrcount;
-
-error_clear_attrs:
-       __iio_remove_event_config_attrs(indio_dev);
-
-       return ret;
 }
 
 static bool iio_check_for_dynamic_events(struct iio_dev *indio_dev)