X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/1daa5e16f9a395fb2943906a715adb35b8106988..8b13f7f89a7648f5578d14b518b9c8a7fcda8144:/LUFA/Drivers/USB/Core/DeviceStandardReq.c

diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.c b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
index f0c336eda..4ee2fce06 100644
--- a/LUFA/Drivers/USB/Core/DeviceStandardReq.c
+++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
@@ -48,10 +48,11 @@ bool    USB_RemoteWakeupEnabled;
 
 void USB_Device_ProcessControlRequest(void)
 {
-	uint8_t* RequestHeader = (uint8_t*)&USB_ControlRequest;
-
-	for (uint8_t RequestHeaderByte = 0; RequestHeaderByte < sizeof(USB_Request_Header_t); RequestHeaderByte++)
-	  *(RequestHeader++) = Endpoint_Read_Byte();
+	USB_ControlRequest.bmRequestType = Endpoint_Read_Byte();
+	USB_ControlRequest.bRequest      = Endpoint_Read_Byte();
+	USB_ControlRequest.wValue        = Endpoint_Read_Word_LE();
+	USB_ControlRequest.wIndex        = Endpoint_Read_Word_LE();
+	USB_ControlRequest.wLength       = Endpoint_Read_Word_LE();
 
 	EVENT_USB_Device_ControlRequest();
 
@@ -338,7 +339,7 @@ static void USB_Device_ClearSetFeature(void)
 					else
 					{
 						Endpoint_ClearStall();
-						Endpoint_ResetFIFO(EndpointIndex);
+						Endpoint_ResetEndpoint(EndpointIndex);
 						Endpoint_ResetDataToggle();
 					}
 				}