Merge 'staging-next' to Linus's tree

[sfrench/cifs-2.6.git] / drivers / staging / comedi / comedi_fops.c

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 14091313cebbe66c419b73453ccd0b158d89c1da..093032ba521a2eb0499d51cdeae9d6dc7666870e 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -537,7 +537,8 @@ static int do_chaninfo_ioctl(struct comedi_device *dev,
 
                        x = (dev->minor << 28) | (it.subdev << 24) | (i << 16) |
                            (s->range_table_list[i]->length);
-                       put_user(x, it.rangelist + i);
+                       if (put_user(x, it.rangelist + i))
+                               return -EFAULT;
                }
 #if 0
                if (copy_to_user(it.rangelist, s->range_type_list,
@@ -1922,6 +1923,7 @@ const struct file_operations comedi_fops = {
        .mmap = comedi_mmap,
        .poll = comedi_poll,
        .fasync = comedi_fasync,
+       .llseek = noop_llseek,
 };
 
 struct class *comedi_class;