diff options
| author | Al Viro <viro@www.linux.org.uk> | 2005-05-04 00:40:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 10:33:14 -0400 |
| commit | 0555985d046348b39e44ff1da2719d73409d7981 (patch) | |
| tree | 563775571cc1a2641d453b5052483cedf8b16698 /drivers/char | |
| parent | 56c3b7d788c21eecf5641020fcf8e4e15d0c5eb0 (diff) | |
[PATCH] sonypi trivial user annotations
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/sonypi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index c812191417c3..fd042060809a 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c | |||
| @@ -1021,11 +1021,11 @@ static int sonypi_misc_ioctl(struct inode *ip, struct file *fp, | |||
| 1021 | ret = -EIO; | 1021 | ret = -EIO; |
| 1022 | break; | 1022 | break; |
| 1023 | } | 1023 | } |
| 1024 | if (copy_to_user((u8 *)arg, &val8, sizeof(val8))) | 1024 | if (copy_to_user(argp, &val8, sizeof(val8))) |
| 1025 | ret = -EFAULT; | 1025 | ret = -EFAULT; |
| 1026 | break; | 1026 | break; |
| 1027 | case SONYPI_IOCSFAN: | 1027 | case SONYPI_IOCSFAN: |
| 1028 | if (copy_from_user(&val8, (u8 *)arg, sizeof(val8))) { | 1028 | if (copy_from_user(&val8, argp, sizeof(val8))) { |
| 1029 | ret = -EFAULT; | 1029 | ret = -EFAULT; |
| 1030 | break; | 1030 | break; |
| 1031 | } | 1031 | } |
| @@ -1038,7 +1038,7 @@ static int sonypi_misc_ioctl(struct inode *ip, struct file *fp, | |||
| 1038 | ret = -EIO; | 1038 | ret = -EIO; |
| 1039 | break; | 1039 | break; |
| 1040 | } | 1040 | } |
| 1041 | if (copy_to_user((u8 *)arg, &val8, sizeof(val8))) | 1041 | if (copy_to_user(argp, &val8, sizeof(val8))) |
| 1042 | ret = -EFAULT; | 1042 | ret = -EFAULT; |
| 1043 | break; | 1043 | break; |
| 1044 | default: | 1044 | default: |