X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fsbus%2Fchar%2Frtc.c;h=9e7aec7530be8dcdfd66c87a8be34268016e2da9;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=2d6f684774eca7a14c7e741f22ae10aa4d6dede2;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git diff --git a/drivers/sbus/char/rtc.c b/drivers/sbus/char/rtc.c index 2d6f68477..9e7aec753 100644 --- a/drivers/sbus/char/rtc.c +++ b/drivers/sbus/char/rtc.c @@ -85,6 +85,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct rtc_time rtc_tm; + void __user *argp = (void __user *)arg; switch (cmd) { @@ -92,7 +93,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, memset(&rtc_tm, 0, sizeof(struct rtc_time)); get_rtc_time(&rtc_tm); - if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time))) + if (copy_to_user(argp, &rtc_tm, sizeof(struct rtc_time))) return -EFAULT; return 0; @@ -102,7 +103,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, if (!capable(CAP_SYS_TIME)) return -EPERM; - if (copy_from_user(&rtc_tm, (struct rtc_time*)arg, sizeof(struct rtc_time))) + if (copy_from_user(&rtc_tm, argp, sizeof(struct rtc_time))) return -EFAULT; set_rtc_time(&rtc_tm);