aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/carma
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/carma')
-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,
749 loff_t *f_pos) 749 loff_t *f_pos)
750{ 750{
751 struct fpga_dev *priv = filp->private_data; 751 struct fpga_dev *priv = filp->private_data;
752 752 return simple_read_from_buffer(buf, count, ppos,
753 count = min_t(size_t, priv->bytes - *f_pos, count); 753 priv->vb.vaddr, priv->bytes);
754 if (copy_to_user(buf, priv->vb.vaddr + *f_pos, count))
755 return -EFAULT;
756
757 *f_pos += count;
758 return count;
759} 754}
760 755
761static loff_t fpga_llseek(struct file *filp, loff_t offset, int origin) 756static loff_t fpga_llseek(struct file *filp, loff_t offset, int origin)