patch-2.3.40 linux/drivers/usb/usb_scsi.c

• Lines: 54
• Date: Mon Jan 17 16:24:48 2000
• Orig file: v2.3.39/linux/drivers/usb/usb_scsi.c
• Orig date: Tue Jan 11 22:31:42 2000

diff -u --recursive --new-file v2.3.39/linux/drivers/usb/usb_scsi.c linux/drivers/usb/usb_scsi.c
@@ -288,7 +288,7 @@
 	cmd[0] = SEND_DIAGNOSTIC;
 	cmd[1] = 4;
 	result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev,0),
-				 US_CBI_ADSC, USB_TYPE_CLASS | USB_RT_INTERFACE,
+				 US_CBI_ADSC, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
 				 0, us->ifnum, cmd, sizeof(cmd), HZ*5);
 
 	/* long wait for reset */
@@ -346,7 +346,7 @@
 			} /* switch */
 
 			result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev,0),
-						 US_CBI_ADSC, USB_TYPE_CLASS | USB_RT_INTERFACE,
+						 US_CBI_ADSC, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
 						 0, us->ifnum,
 						 cmd, us->fixedlength, HZ*5);
 			US_DEBUGP("First usb_control_msg returns %d\n", result);
@@ -367,7 +367,7 @@
 
 				result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev,0),
 							 US_CBI_ADSC, 
-							 USB_TYPE_CLASS | USB_RT_INTERFACE,
+							 USB_TYPE_CLASS | USB_RECIP_INTERFACE,
 							 0, us->ifnum,
 							 cmd, us->fixedlength, HZ*5);
 				US_DEBUGP("Next usb_control_msg returns %d\n", result);
@@ -378,7 +378,7 @@
 			}
 		} else { /* !US_FL_FIXED_COMMAND */
 			result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev,0),
-						 US_CBI_ADSC, USB_TYPE_CLASS | USB_RT_INTERFACE,
+						 US_CBI_ADSC, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
 						 0, us->ifnum,
 						 srb->cmnd, srb->cmd_len, HZ*5);
 		}
@@ -411,7 +411,7 @@
 		while (retry--) {
 			result = usb_control_msg(us->pusb_dev, usb_rcvctrlpipe(us->pusb_dev,0),
 						 USB_REQ_GET_STATUS, USB_DIR_IN |
-						 USB_TYPE_STANDARD | USB_RT_DEVICE,
+						 USB_TYPE_STANDARD | USB_RECIP_DEVICE,
 						 0, us->ifnum, status, sizeof(status), HZ*5);
 			if (result != USB_ST_TIMEOUT)
 				break;
@@ -517,7 +517,7 @@
 	int result;
 
 	result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev,0),
-				 US_BULK_RESET, USB_TYPE_CLASS | USB_RT_INTERFACE,
+				 US_BULK_RESET, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
 				 US_BULK_RESET_HARD, us->ifnum,
 				 NULL, 0, HZ*5);
 	if (result)