patch-2.4.0-test8 linux/drivers/media/video/zr36120.c

• Lines: 20
• Date: Tue Aug 29 14:09:15 2000
• Orig file: v2.4.0-test7/linux/drivers/media/video/zr36120.c
• Orig date: Wed Aug 23 18:36:37 2000

diff -u --recursive --new-file v2.4.0-test7/linux/drivers/media/video/zr36120.c linux/drivers/media/video/zr36120.c
@@ -1242,7 +1242,8 @@
 	 case VIDIOCCAPTURE:
 	 {
 		int v;
-		get_user_ret(v,(int*)arg, -EFAULT);
+		if (get_user(v, (int *)arg))
+			return -EFAULT;
 		DEBUG(printk(CARD_DEBUG "VIDIOCCAPTURE(%d)\n",CARD,v));
 
 		if (v==0) {
@@ -1314,7 +1315,8 @@
 	 case VIDIOCSYNC:
 	 {
 		int i;
-		get_user_ret(i,(int*)arg, -EFAULT);
+		if (get_user(i, (int *) arg))
+			return -EFAULT;
 		DEBUG(printk(CARD_DEBUG "VIDEOCSYNC(%d)\n",CARD,i));
 		if (i<0 || i>ZORAN_MAX_FBUFFERS)
 			return -EINVAL;