Fixed random enumeration failure while in device mode due to interrupts causing the Set Address request to exceed maximum timings.

LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c

@@ -126,20 +126,19 @@ static void USB_Device_SetAddress(void)
 {
 	uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F);
 
+	ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+	{
 		Endpoint_ClearSETUP();
 		
 		Endpoint_ClearStatusStage();
 		
-	while (!(Endpoint_IsINReady()))
+		while (!(Endpoint_IsINReady()));
-	{
-		if (USB_DeviceState == DEVICE_STATE_Unattached)
-		  return;
-	}
 
 		USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
 
 		USB_Device_SetDeviceAddress(DeviceAddress);
 	}
+}
 
 static void USB_Device_SetConfiguration(void)
 {
@@ -147,6 +146,8 @@ static void USB_Device_SetConfiguration(void)
 	if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)
 	  return;
 	#else
+	USB_Descriptor_Device_t* DevDescriptorPtr;
+
 	#if defined(USE_FLASH_DESCRIPTORS)
 		#define MemoryAddressSpace  MEMSPACE_FLASH
 	#elif defined(USE_EEPROM_DESCRIPTORS)
@@ -157,8 +158,6 @@ static void USB_Device_SetConfiguration(void)
 		uint8_t MemoryAddressSpace;
 	#endif
 	
-	USB_Descriptor_Device_t* DevDescriptorPtr;
-
 	if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr
 	#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
 	                               , &MemoryAddressSpace
@@ -199,7 +198,7 @@ static void USB_Device_SetConfiguration(void)
 	EVENT_USB_Device_ConfigurationChanged();
 }
 
-void USB_Device_GetConfiguration(void)
+static void USB_Device_GetConfiguration(void)
 {
 	Endpoint_ClearSETUP();
 

LUFA/ManPages/ChangeLog.txt

@@ -71,6 +71,7 @@
   *  - Fixed broken FLASH/EEPROM programming in the AVRISP-MKII clone project when writing in non-paged mode and the polling byte cannot be used
   *  - Fixed SPI driver not explicitly setting /SS and MISO pins as inputs when SPI_Init() is called
   *  - Fixed ISR definition conflict in the XPLAIN bridge between the software UART and the AVRISP-MKII ISP modules
+  *  - Fixed random enumeration failure while in device mode due to interrupts causing the Set Address request to exceed maximum timings
   *
   *  \section Sec_ChangeLog100807 Version 100807
   *  <b>New:</b>