Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / infiniband / hw / ipath / ipath_diag.c

diff --git a/drivers/infiniband/hw/ipath/ipath_diag.c b/drivers/infiniband/hw/ipath/ipath_diag.c
index d4ce8b63e19eba275cc2e11235dc751ed438e1f1..daef61d5e5bb58afaf224da91a9789869a1224ce 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_diag.c
+++ b/drivers/infiniband/hw/ipath/ipath_diag.c
@@ -65,7 +65,8 @@ static const struct file_operations diag_file_ops = {
        .write = ipath_diag_write,
        .read = ipath_diag_read,
        .open = ipath_diag_open,
-       .release = ipath_diag_release
+       .release = ipath_diag_release,
+       .llseek = default_llseek,
 };
 
 static ssize_t ipath_diagpkt_write(struct file *fp,
@@ -75,6 +76,7 @@ static ssize_t ipath_diagpkt_write(struct file *fp,
 static const struct file_operations diagpkt_file_ops = {
        .owner = THIS_MODULE,
        .write = ipath_diagpkt_write,
+       .llseek = noop_llseek,
 };
 
 static atomic_t diagpkt_count = ATOMIC_INIT(0);