diff --git a/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp b/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
index f703f74d73..b646986765 100644
--- a/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
+++ b/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
@@ -1066,15 +1066,12 @@ AudioControlInterface::InitACHeader(size_t interface,
 
 uint32
 AudioControlInterface::GetChannelsDescription(
-		Vector<multi_channel_info>& Channels, multi_description* Description,
-		Vector<_AudioControl*>&Terminals)
+	Vector<multi_channel_info>& Channels, multi_description* Description,
+	Vector<_AudioControl*>& Terminals, bool isForInput)
 {
 	uint32 addedChannels = 0;
 
 	for (int32 i = 0; i < Terminals.Count(); i++) {
-		bool bIsInputTerminal
-			= Terminals[i]->SubType() == USB_AUDIO_AC_INPUT_TERMINAL;
-
 		AudioChannelCluster* cluster = Terminals[i]->OutCluster();
 		if (cluster == NULL || cluster->ChannelsCount() <= 0) {
 			TRACE(ERR, "Terminal #%d ignored due null "
@@ -1083,9 +1080,9 @@ AudioControlInterface::GetChannelsDescription(
 		}
 
 		uint32 channels = GetTerminalChannels(Channels, cluster,
-			bIsInputTerminal ? B_MULTI_INPUT_CHANNEL : B_MULTI_OUTPUT_CHANNEL);
+			isForInput ? B_MULTI_INPUT_CHANNEL : B_MULTI_OUTPUT_CHANNEL);
 
-		if (bIsInputTerminal)
+		if (isForInput)
 			Description->input_channel_count += channels;
 		else
 			Description->output_channel_count += channels;
@@ -1134,7 +1131,7 @@ AudioControlInterface::GetTerminalChannels(Vector<multi_channel_info>& Channels,
 
 uint32
 AudioControlInterface::GetBusChannelsDescription(
-		Vector<multi_channel_info>& Channels, multi_description* Description)
+	Vector<multi_channel_info>& Channels, multi_description* Description)
 {
 	uint32 addedChannels = 0;
 
diff --git a/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.h b/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.h
index 5935ced6a5..82023ed292 100644
--- a/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.h
+++ b/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.h
@@ -283,7 +283,8 @@ public:
 			uint32			GetChannelsDescription(
 								Vector<multi_channel_info>& Channels,
 								multi_description* Description,
-								Vector<_AudioControl*>& USBTerminals);
+								Vector<_AudioControl*>& USBTerminals,
+								bool isForInput);
 			uint32			GetBusChannelsDescription(
 								Vector<multi_channel_info>& Channels,
 								multi_description* Description);
diff --git a/src/add-ons/kernel/drivers/audio/usb/Device.cpp b/src/add-ons/kernel/drivers/audio/usb/Device.cpp
index 2271df3568..5e4cce114b 100644
--- a/src/add-ons/kernel/drivers/audio/usb/Device.cpp
+++ b/src/add-ons/kernel/drivers/audio/usb/Device.cpp
@@ -493,17 +493,18 @@ Device::_MultiGetDescription(multi_description* multiDescription)
 
 	Description.control_panel[0] = '\0';
 
-	Vector<_AudioControl*> USBTerminals;
+	Vector<multi_channel_info> Channels;
 
-	// channels (USB I/O terminals) are already in fStreams
-	// in outputs->inputs order, use them.
+	// channels (USB I/O terminals) are already in fStreams in outputs->inputs order.
 	for (int i = 0; i < fStreams.Count(); i++) {
-		USBTerminals.PushBack(fAudioControl.Find(fStreams[i]->TerminalLink()));
+		Vector<_AudioControl*> USBTerminal;
+		USBTerminal.PushBack(fAudioControl.Find(fStreams[i]->TerminalLink()));
+
+		fAudioControl.GetChannelsDescription(Channels, &Description, USBTerminal,
+			fStreams[i]->IsInput());
 		fStreams[i]->GetFormatsAndRates(&Description);
 	}
 
-	Vector<multi_channel_info> Channels;
-	fAudioControl.GetChannelsDescription(Channels, &Description, USBTerminals);
 	fAudioControl.GetBusChannelsDescription(Channels, &Description);
 
 	// Description.request_channel_count = channels + bus_channels;