Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 883
b: refs/heads/master
c: 9b52523
h: refs/heads/master
i:
  881: c832c56
  879: 7651cdf
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed May 4, 2005
1 parent e9cea8a commit 88ebf1b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3c51f196b658fa1920c84b0752a55ed251d22d52
refs/heads/master: 9b52523aff51e3b245e6ec8887e3fcf190da4711
4 changes: 2 additions & 2 deletions trunk/drivers/char/mbcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/char/mbcs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 88ebf1b

Please sign in to comment.