Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / iio / industrialio-event.c

diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
index 258a973a1fb8da2d23457fe3afc139f0f9befcff..bfbf4d419f41c391ae4be154adaa125956af6558 100644 (file)
--- a/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@ -345,6 +345,9 @@ static int iio_device_add_event(struct iio_dev *indio_dev,
                        &indio_dev->event_interface->dev_attr_list);
                kfree(postfix);
 
+               if ((ret == -EBUSY) && (shared_by != IIO_SEPARATE))
+                       continue;
+
                if (ret)
                        return ret;