Merge 'staging-next' to Linus's tree

[sfrench/cifs-2.6.git] / drivers / staging / iio / industrialio-core.c

diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index cefeb647b81b1649fb8965b5def335272d9b1b27..f3bf111f354f592ce3592865bb2a85692a0a2d18 100644 (file)
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -340,6 +340,7 @@ static const struct file_operations iio_event_chrdev_fileops = {
        .release = iio_event_chrdev_release,
        .open = iio_event_chrdev_open,
        .owner = THIS_MODULE,
+       .llseek = noop_llseek,
 };
 
 static void iio_event_dev_release(struct device *dev)