summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-08-19 18:08:37 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2014-10-09 08:39:06 +0200
commitd88c242623e90c99864317baae1e192bece2af57 (patch)
treeb76dd610d6ba1a6b1ea6d6b0270d18d20d6c2f86 /drivers/misc
parentcarma-fpga: switch to fixed_size_llseek() (diff)
downloadlinux-d88c242623e90c99864317baae1e192bece2af57.tar.xz
linux-d88c242623e90c99864317baae1e192bece2af57.zip
carma-fpga: switch to simple_read_from_buffer()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/carma/carma-fpga-program.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
index f390deeae3cf..7e97e53f9ff2 100644
--- a/drivers/misc/carma/carma-fpga-program.c
+++ b/drivers/misc/carma/carma-fpga-program.c
@@ -749,13 +749,8 @@ static ssize_t fpga_read(struct file *filp, char __user *buf, size_t count,
loff_t *f_pos)
{
struct fpga_dev *priv = filp->private_data;
-
- count = min_t(size_t, priv->bytes - *f_pos, count);
- if (copy_to_user(buf, priv->vb.vaddr + *f_pos, count))
- return -EFAULT;
-
- *f_pos += count;
- return count;
+ return simple_read_from_buffer(buf, count, ppos,
+ priv->vb.vaddr, priv->bytes);
}
static loff_t fpga_llseek(struct file *filp, loff_t offset, int origin)