X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/81bd8f2f83c0878f2f3ab3cdd73f284a1656c341..8f4f48d963d0dd5751298a3a301dcbb32e26082b:/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c

diff --git a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
index 1e91a6134..15fcd588d 100644
--- a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
+++ b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
@@ -44,7 +44,11 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
 
 	if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_INTERFACE)
 	{
-		if ((USB_ControlRequest.wIndex & 0xFF) != AudioInterfaceInfo->Config.StreamingInterfaceNumber)
+		uint8_t InterfaceIndex = (USB_ControlRequest.wIndex & 0xFF);
+	
+		if ((InterfaceIndex != AudioInterfaceInfo->Config.ControlInterfaceNumber) &&
+		    (InterfaceIndex != AudioInterfaceInfo->Config.StreamingInterfaceNumber))
+		
 		  return;
 	}
 	else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT)
@@ -121,7 +125,7 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
 					Endpoint_ClearIN();
 
 					CALLBACK_Audio_Device_GetSetInterfaceProperty(AudioInterfaceInfo, Property, Entity,
-				                                                  Parameter, NULL, NULL);
+				                                                  Parameter, &ValueLength, Value);
 				}
 			}
 
@@ -207,6 +211,7 @@ bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* const AudioIn
 	return true;
 }
 
+// cppcheck-suppress unusedFunction
 void Audio_Device_Event_Stub(void)
 {