X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/99d8a3936384d1e9286dfecfb6f7896294cd6c11..bd85422d2beb8b14e617839b7d05e7306df83edc:/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c

diff --git a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
index 64af1406b..83c85ded5 100644
--- a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
+++ b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
@@ -139,8 +139,6 @@ static void USB_Device_SetAddress(void)
 	USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
 
 	USB_Device_SetDeviceAddress(DeviceAddress);
-
-	return;
 }
 
 static void USB_Device_SetConfiguration(void)
@@ -254,8 +252,8 @@ static void USB_Device_GetInternalSerialDescriptor(void)
 
 static void USB_Device_GetDescriptor(void)
 {
-	void*    DescriptorPointer;
-	uint16_t DescriptorSize;
+	const void* DescriptorPointer;
+	uint16_t    DescriptorSize;
 	
 	#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
 	uint8_t  DescriptorAddressSpace;
@@ -364,18 +362,18 @@ static void USB_Device_ClearSetFeature(void)
 
 				Endpoint_SelectEndpoint(EndpointIndex);
 
-				if (!(Endpoint_IsEnabled()))
-				  return;
-
-				if (USB_ControlRequest.bRequest == REQ_SetFeature)
-				{
-					Endpoint_StallTransaction();
-				}
-				else
-				{
-					Endpoint_ClearStall();
-					Endpoint_ResetFIFO(EndpointIndex);
-					Endpoint_ResetDataToggle();
+				if (Endpoint_IsEnabled())
+				{				
+					if (USB_ControlRequest.bRequest == REQ_SetFeature)
+					{
+						Endpoint_StallTransaction();
+					}
+					else
+					{
+						Endpoint_ClearStall();
+						Endpoint_ResetFIFO(EndpointIndex);
+						Endpoint_ResetDataToggle();
+					}					
 				}
 			}