patch-2.4.9 linux/drivers/usb/usb-ohci.c

• Lines: 60
• Date: Wed Aug 15 01:22:16 2001
• Orig file: v2.4.8/linux/drivers/usb/usb-ohci.c
• Orig date: Sun Aug 12 13:28:00 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/usb/usb-ohci.c linux/drivers/usb/usb-ohci.c
@@ -1805,7 +1805,9 @@
 	len = i/8 + 1;
   
 	if (ret > 0) { 
-		memcpy (rh_data, data, min (len, min (rh_len, sizeof(data))));
+		memcpy(rh_data, data,
+		       min(unsigned int, len,
+			   min(unsigned int, rh_len, sizeof(data))));
 		return len;
 	}
 	return 0;
@@ -1987,10 +1989,18 @@
 		case RH_GET_DESCRIPTOR:
 			switch ((wValue & 0xff00) >> 8) {
 				case (0x01): /* device descriptor */
-					len = min (leni, min (sizeof (root_hub_dev_des), wLength));
+					len = min(unsigned int,
+						  leni,
+						  min(unsigned int,
+						      sizeof (root_hub_dev_des),
+						      wLength));
 					data_buf = root_hub_dev_des; OK(len);
 				case (0x02): /* configuration descriptor */
-					len = min (leni, min (sizeof (root_hub_config_des), wLength));
+					len = min(unsigned int,
+						  leni,
+						  min(unsigned int,
+						      sizeof (root_hub_config_des),
+						      wLength));
 					data_buf = root_hub_config_des; OK(len);
 				case (0x03): /* string descriptors */
 					len = usb_root_hub_string (wValue & 0xff,
@@ -1998,7 +2008,7 @@
 						data, wLength);
 					if (len > 0) {
 						data_buf = data;
-						OK (min (leni, len));
+						OK(min(int, leni, len));
 					}
 					// else fallthrough
 				default: 
@@ -2033,7 +2043,8 @@
 				data_buf [10] = data_buf [9] = 0xff;
 			    }
 				
-			    len = min (leni, min (data_buf [0], wLength));
+			    len = min(unsigned int, leni,
+				      min(unsigned int, data_buf [0], wLength));
 			    OK (len);
 			}
  
@@ -2050,7 +2061,7 @@
 	// ohci_dump_roothub (ohci, 0);
 #endif
 
-	len = min(len, leni);
+	len = min(int, len, leni);
 	if (data != data_buf)
 	    memcpy (data, data_buf, len);
   	urb->actual_length = len;