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

• Lines: 18
• Date: Wed Aug 15 01:22:15 2001
• Orig file: v2.4.8/linux/drivers/net/wan/comx-hw-locomx.c
• Orig date: Mon Sep 18 15:02:03 2000

diff -u --recursive --new-file v2.4.8/linux/drivers/net/wan/comx-hw-locomx.c linux/drivers/net/wan/comx-hw-locomx.c
@@ -324,7 +324,7 @@
 	if (count >= len - off) {
 		*eof = 1;
 	}
-	return ( min(count, len - off) );
+	return min(int, count, len - off);
 }
 
 static int locomx_write_proc(struct file *file, const char *buffer,
@@ -339,7 +339,7 @@
 		return -ENOMEM;
 	}
 
-	copy_from_user(page, buffer, count = min(count, PAGE_SIZE));
+	copy_from_user(page, buffer, count = min(unsigned long, count, PAGE_SIZE));
 	if (*(page + count - 1) == '\n') {
 		*(page + count - 1) = 0;
 	}