patch-2.4.9 linux/drivers/usb/storage/datafab.c

Next file: linux/drivers/usb/storage/datafab.h
Previous file: linux/drivers/usb/serial/io_usbvend.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.8/linux/drivers/usb/storage/datafab.c linux/drivers/usb/storage/datafab.c
@@ -204,7 +204,7 @@
 
 	do {
 		// loop, never allocate or transfer more than 64k at once (min(128k, 255*info->ssize) is the real limit)
-		len = min(totallen, 65536);
+		len = min(int, totallen, 65536);
 
 		if (use_sg) {
 			sg = (struct scatterlist *) dest;
@@ -329,7 +329,7 @@
 
 	do {
 		// loop, never allocate or transfer more than 64k at once (min(128k, 255*info->ssize) is the real limit)
-		len = min(totallen, 65536);
+		len = min(int, totallen, 65536);
 
 		if (use_sg) {
 			sg = (struct scatterlist *) src;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)