Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

[mv-sheeva.git] / drivers / staging / iio / industrialio-ring.c

diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c
index ada159bbb1f703a5df0e9aad54f00834890fa636..6ab578e4f5f36c99ffa9c938204dc06c84a40952 100644 (file)
--- a/drivers/staging/iio/industrialio-ring.c
+++ b/drivers/staging/iio/industrialio-ring.c
@@ -149,12 +149,10 @@ __iio_request_ring_buffer_event_chrdev(struct iio_ring_buffer *buf,
 {
        int ret;
 
-       buf->ev_int.id = id;
-
        snprintf(buf->ev_int._name, sizeof(buf->ev_int._name),
                 "%s:event%d",
                 dev_name(&buf->dev),
-                buf->ev_int.id);
+                id);
        ret = iio_setup_ev_int(&(buf->ev_int),
                               buf->ev_int._name,
                               owner,