patch-2.4.9 linux/drivers/net/wan/comx-hw-comx.c

• Lines: 31
• Date: Wed Aug 15 01:22:15 2001
• Orig file: v2.4.8/linux/drivers/net/wan/comx-hw-comx.c
• Orig date: Tue May 22 10:23:16 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/net/wan/comx-hw-comx.c linux/drivers/net/wan/comx-hw-comx.c
@@ -1044,7 +1044,7 @@
 		if (!(page = (char *)__get_free_page(GFP_KERNEL))) {
 			return -ENOMEM;
 		}
-		if(copy_from_user(page, buffer, count = (min(count, PAGE_SIZE))))
+		if(copy_from_user(page, buffer, count = (min(int, count, PAGE_SIZE))))
 		{
 			count = -EFAULT;
 			goto out;
@@ -1182,8 +1182,10 @@
 			len = sprintf(page, "external\n");
 		}
 	} else if (strcmp(file->name, FILENAME_FIRMWARE) == 0) {
-		len = min(FILE_PAGESIZE, min(count, 
-			hw->firmware ? (hw->firmware->len - off) :  0));
+		len = min(int, FILE_PAGESIZE,
+			  min(int, count, 
+			      hw->firmware ?
+			      (hw->firmware->len - off) : 0));
 		if (len < 0) {
 			len = 0;
 		}
@@ -1203,7 +1205,7 @@
 	if (count >= len - off) {
 		*eof = 1;
 	}
-	return(min(count, len - off));
+	return min(int, count, len - off);
 }
 
 /* Called on echo comx >boardtype */