X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/0c5afda7e8d7c3bbaa15297c05d39dc4c90e4d5b..70284d390f524e84e0539ad1e869366aaf94cf24:/LUFA/Drivers/USB/Core/DeviceStandardReq.c

diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.c b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
index e36820387..a502c0949 100644
--- a/LUFA/Drivers/USB/Core/DeviceStandardReq.c
+++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
@@ -114,20 +114,20 @@ void USB_Device_ProcessControlRequest(void)
 
 static void USB_Device_SetAddress(void)
 {
-	uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F);
-
-	ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
-	{
-		Endpoint_ClearSETUP();
+	uint8_t DeviceAddress       = (USB_ControlRequest.wValue & 0x7F);
+	uint_reg_t CurrentGlobalInt = USB_INT_GetGlobalEnableState();
+	USB_INT_GlobalDisable();
+				
+	Endpoint_ClearSETUP();
 
-		Endpoint_ClearStatusStage();
+	Endpoint_ClearStatusStage();
 
-		while (!(Endpoint_IsINReady()));
+	while (!(Endpoint_IsINReady()));
 
-		USB_Device_SetDeviceAddress(DeviceAddress);
-	}
-	
+	USB_Device_SetDeviceAddress(DeviceAddress);
 	USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
+	
+	USB_INT_SetGlobalEnableState(CurrentGlobalInt);
 }
 
 static void USB_Device_SetConfiguration(void)