From 88ebf1b2ce56349d911fd58ba61139d365f307cf Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 4 May 2005 05:39:01 +0100 Subject: [PATCH] --- yaml --- r: 883 b: refs/heads/master c: 9b52523aff51e3b245e6ec8887e3fcf190da4711 h: refs/heads/master i: 881: c832c568cc00bf39242b32842cc476b7454bb58a 879: 7651cdf6c40a5484cdd96d79893dbb857a798fa5 v: v3 --- [refs] | 2 +- trunk/drivers/char/mbcs.c | 4 ++-- trunk/drivers/char/mbcs.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 684147063fbb..da43f527e50f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c51f196b658fa1920c84b0752a55ed251d22d52 +refs/heads/master: 9b52523aff51e3b245e6ec8887e3fcf190da4711 diff --git a/trunk/drivers/char/mbcs.c b/trunk/drivers/char/mbcs.c index ec7100556c50..ac9cfa9701ea 100644 --- a/trunk/drivers/char/mbcs.c +++ b/trunk/drivers/char/mbcs.c @@ -394,7 +394,7 @@ int mbcs_open(struct inode *ip, struct file *fp) return -ENODEV; } -ssize_t mbcs_sram_read(struct file * fp, char *buf, size_t len, loff_t * off) +ssize_t mbcs_sram_read(struct file * fp, char __user *buf, size_t len, loff_t * off) { struct cx_dev *cx_dev = fp->private_data; struct mbcs_soft *soft = cx_dev->soft; @@ -419,7 +419,7 @@ ssize_t mbcs_sram_read(struct file * fp, char *buf, size_t len, loff_t * off) } ssize_t -mbcs_sram_write(struct file * fp, const char *buf, size_t len, loff_t * off) +mbcs_sram_write(struct file * fp, const char __user *buf, size_t len, loff_t * off) { struct cx_dev *cx_dev = fp->private_data; struct mbcs_soft *soft = cx_dev->soft; diff --git a/trunk/drivers/char/mbcs.h b/trunk/drivers/char/mbcs.h index 844644d201c5..e7fd47e43257 100644 --- a/trunk/drivers/char/mbcs.h +++ b/trunk/drivers/char/mbcs.h @@ -543,9 +543,9 @@ struct mbcs_soft { }; extern int mbcs_open(struct inode *ip, struct file *fp); -extern ssize_t mbcs_sram_read(struct file *fp, char *buf, size_t len, +extern ssize_t mbcs_sram_read(struct file *fp, char __user *buf, size_t len, loff_t * off); -extern ssize_t mbcs_sram_write(struct file *fp, const char *buf, size_t len, +extern ssize_t mbcs_sram_write(struct file *fp, const char __user *buf, size_t len, loff_t * off); extern loff_t mbcs_sram_llseek(struct file *filp, loff_t off, int whence); extern int mbcs_gscr_mmap(struct file *fp, struct vm_area_struct *vma);