Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 888
b: refs/heads/master
c: 0555985
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed May 4, 2005
1 parent f14bad2 commit 797f38e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 56c3b7d788c21eecf5641020fcf8e4e15d0c5eb0
refs/heads/master: 0555985d046348b39e44ff1da2719d73409d7981
6 changes: 3 additions & 3 deletions trunk/drivers/char/sonypi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1021,11 +1021,11 @@ static int sonypi_misc_ioctl(struct inode *ip, struct file *fp,
ret = -EIO;
break;
}
if (copy_to_user((u8 *)arg, &val8, sizeof(val8)))
if (copy_to_user(argp, &val8, sizeof(val8)))
ret = -EFAULT;
break;
case SONYPI_IOCSFAN:
if (copy_from_user(&val8, (u8 *)arg, sizeof(val8))) {
if (copy_from_user(&val8, argp, sizeof(val8))) {
ret = -EFAULT;
break;
}
Expand All @@ -1038,7 +1038,7 @@ static int sonypi_misc_ioctl(struct inode *ip, struct file *fp,
ret = -EIO;
break;
}
if (copy_to_user((u8 *)arg, &val8, sizeof(val8)))
if (copy_to_user(argp, &val8, sizeof(val8)))
ret = -EFAULT;
break;
default:
Expand Down

0 comments on commit 797f38e

Please sign in to comment.