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

• Lines: 26
• Date: Thu Sep 13 16:04:43 2001
• Orig file: v2.4.9/linux/drivers/net/wan/comx-hw-locomx.c
• Orig date: Mon Aug 27 12:41:43 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/net/wan/comx-hw-locomx.c linux/drivers/net/wan/comx-hw-locomx.c
@@ -54,6 +54,7 @@
 
 MODULE_AUTHOR("Gergely Madarasz <gorgo@itc.hu>");
 MODULE_DESCRIPTION("Hardware driver for the LoCOMX board");
+MODULE_LICENSE("GPL");
 
 #define RX_DMA 3
 #define TX_DMA 1
@@ -324,7 +325,7 @@
 	if (count >= len - off) {
 		*eof = 1;
 	}
-	return min(int, count, len - off);
+	return min_t(int, count, len - off);
 }
 
 static int locomx_write_proc(struct file *file, const char *buffer,
@@ -339,7 +340,7 @@
 		return -ENOMEM;
 	}
 
-	copy_from_user(page, buffer, count = min(unsigned long, count, PAGE_SIZE));
+	copy_from_user(page, buffer, count = min_t(unsigned long, count, PAGE_SIZE));
 	if (*(page + count - 1) == '\n') {
 		*(page + count - 1) = 0;
 	}