patch-2.4.19 linux-2.4.19/drivers/char/machzwd.c

• Lines: 24
• Date: Fri Aug 2 17:39:43 2002
• Orig file: linux-2.4.18/drivers/char/machzwd.c
• Orig date: Thu Sep 13 15:21:32 2001

diff -urN linux-2.4.18/drivers/char/machzwd.c linux-2.4.19/drivers/char/machzwd.c
@@ -348,20 +348,15 @@
 static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 	unsigned long arg)
 {
-	int ret;
-		
 	switch(cmd){
 		case WDIOC_GETSUPPORT:
-			ret = copy_to_user((struct watchdog_info *)arg, 
-						&zf_info, sizeof(zf_info));
-			if(ret)
+			if (copy_to_user((struct watchdog_info *)arg, 
+					 &zf_info, sizeof(zf_info)))
 				return -EFAULT;
 			break;
 	  
 		case WDIOC_GETSTATUS:
-			ret = copy_to_user((int *)arg, &zf_is_open,
-								sizeof(int));
-			if(ret)
+			if (copy_to_user((int *)arg, &zf_is_open, sizeof(int)))
 				return -EFAULT;
 			break;