X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/58167f5d4db1251aef80230e893eac5509724975..accadba2dda2614d6a6669cb7eba9d8357274bfe:/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c

diff --git a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
index 8d26874fa..d13ac7439 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)
@@ -193,7 +191,10 @@ static void USB_Device_SetConfiguration(void)
 
 	Endpoint_ClearStatusStage();
 
-	USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;
+	if (USB_ConfigurationNumber)
+	  USB_DeviceState = DEVICE_STATE_Configured;
+	else
+	  USB_DeviceState = (USB_Device_IsAddressSet()) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;
 
 	EVENT_USB_Device_ConfigurationChanged();
 }