Merge 'staging-next' to Linus's tree

This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index fecb89e8c66..093032ba521 100644
--- 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,