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

• Lines: 27
• Date: Wed Aug 15 01:22:15 2001
• Orig file: v2.4.8/linux/drivers/net/wan/comx-hw-mixcom.c
• Orig date: Tue Jul 3 17:08:20 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/net/wan/comx-hw-mixcom.c linux/drivers/net/wan/comx-hw-mixcom.c
@@ -121,7 +121,7 @@
 
 
 	outsb(dev->base_addr + HSCX_FIFO,
-        	&(hw->sending->data[hw->tx_ptr]), min(to_send, 32));
+        	&(hw->sending->data[hw->tx_ptr]), min(unsigned int, to_send, 32));
 	if (to_send <= 32) {
         	hscx_cmd(dev, HSCX_XTF | HSCX_XME);
 	        kfree_skb(hw->sending);
@@ -696,7 +696,7 @@
 	}
 	*start = page + off;
 	if (count >= len - off) *eof = 1;
-	return ( min(count, len - off) );
+	return min(int, count, len - off);
 }
 
 
@@ -763,7 +763,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;
 	}