diff options
| author | Dave Kleikamp <shaggy@kleikamp.(none)> | 2005-05-04 16:43:30 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@kleikamp.(none)> | 2005-05-04 16:43:30 -0500 |
| commit | ddf3e298b33f3e15a2e6272e0146dfa940c89a74 (patch) | |
| tree | cd474d1eca4f337958e97a09dcb0974b1f8aba82 /drivers/char/sonypi.c | |
| parent | 7a694ca74958b97ae2d437c8a730bddd9e9792c3 (diff) | |
| parent | 1d42a0ecf478962e8aede355a0be41365c117ff0 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/char/sonypi.c')
| -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 c812191417c..fd042060809 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, 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; } @@ -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: |