patch-2.4.10 linux/drivers/usb/uhci.c

• Lines: 38
• Date: Mon Sep 10 08:06:32 2001
• Orig file: v2.4.9/linux/drivers/usb/uhci.c
• Orig date: Mon Aug 27 12:41:45 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/usb/uhci.c linux/drivers/usb/uhci.c
@@ -2131,14 +2131,14 @@
 	case RH_GET_DESCRIPTOR:
 		switch ((wValue & 0xff00) >> 8) {
 		case 0x01:	/* device descriptor */
-			len = min(unsigned int, leni,
-				  min(unsigned int,
+			len = min_t(unsigned int, leni,
+				  min_t(unsigned int,
 				      sizeof(root_hub_dev_des), wLength));
 			memcpy(data, root_hub_dev_des, len);
 			OK(len);
 		case 0x02:	/* configuration descriptor */
-			len = min(unsigned int, leni,
-				  min(unsigned int,
+			len = min_t(unsigned int, leni,
+				  min_t(unsigned int,
 				      sizeof(root_hub_config_des), wLength));
 			memcpy (data, root_hub_config_des, len);
 			OK(len);
@@ -2147,15 +2147,15 @@
 				uhci->io_addr, "UHCI-alt",
 				data, wLength);
 			if (len > 0) {
-				OK(min(int, leni, len));
+				OK(min_t(int, leni, len));
 			} else 
 				stat = -EPIPE;
 		}
 		break;
 	case RH_GET_DESCRIPTOR | RH_CLASS:
 		root_hub_hub_des[2] = uhci->rh.numports;
-		len = min(unsigned int, leni,
-			  min(unsigned int, sizeof(root_hub_hub_des), wLength));
+		len = min_t(unsigned int, leni,
+			  min_t(unsigned int, sizeof(root_hub_hub_des), wLength));
 		memcpy(data, root_hub_hub_des, len);
 		OK(len);
 	case RH_GET_CONFIGURATION: