diff --git a/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp b/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
index 42327918b8..f703f74d73 100644
--- a/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
+++ b/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
@@ -1076,7 +1076,7 @@ AudioControlInterface::GetChannelsDescription(
 			= Terminals[i]->SubType() == USB_AUDIO_AC_INPUT_TERMINAL;
 
 		AudioChannelCluster* cluster = Terminals[i]->OutCluster();
-		if (cluster == 0 || cluster->ChannelsCount() <= 0) {
+		if (cluster == NULL || cluster->ChannelsCount() <= 0) {
 			TRACE(ERR, "Terminal #%d ignored due null "
 				"channels cluster (%08x)\n", Terminals[i]->ID(), cluster);
 			continue;
@@ -1167,7 +1167,7 @@ AudioControlInterface::GetBusChannelsDescription(
 			continue;
 
 		AudioChannelCluster* cluster = control->OutCluster();
-		if (cluster == 0 || cluster->ChannelsCount() <= 0) {
+		if (cluster == NULL || cluster->ChannelsCount() <= 0) {
 			TRACE(ERR, "Terminal #%d ignored due null "
 				"channels cluster (%08x)\n", control->ID(), cluster);
 			continue;
diff --git a/src/add-ons/kernel/drivers/audio/usb/AudioStreamingInterface.cpp b/src/add-ons/kernel/drivers/audio/usb/AudioStreamingInterface.cpp
index f9d04b0245..564f8c6803 100644
--- a/src/add-ons/kernel/drivers/audio/usb/AudioStreamingInterface.cpp
+++ b/src/add-ons/kernel/drivers/audio/usb/AudioStreamingInterface.cpp
@@ -476,7 +476,7 @@ AudioStreamingInterface::~AudioStreamingInterface()
 uint8
 AudioStreamingInterface::TerminalLink()
 {
-	if (fAlternates[fActiveAlternate]->Interface() != 0)
+	if (fAlternates[fActiveAlternate]->Interface() != NULL)
 		return fAlternates[fActiveAlternate]->Interface()->fTerminalLink;
 	return 0;
 }
diff --git a/src/add-ons/kernel/drivers/audio/usb/Device.cpp b/src/add-ons/kernel/drivers/audio/usb/Device.cpp
index 402323ff16..2271df3568 100644
--- a/src/add-ons/kernel/drivers/audio/usb/Device.cpp
+++ b/src/add-ons/kernel/drivers/audio/usb/Device.cpp
@@ -493,27 +493,18 @@ Device::_MultiGetDescription(multi_description* multiDescription)
 
 	Description.control_panel[0] = '\0';
 
-	Vector<_AudioControl*>	USBTerminals;
+	Vector<_AudioControl*> USBTerminals;
 
-	// channels (USB I/O  terminals) are already in fStreams
+	// channels (USB I/O terminals) are already in fStreams
 	// in outputs->inputs order, use them.
 	for (int i = 0; i < fStreams.Count(); i++) {
-		uint8 id = fStreams[i]->TerminalLink();
-		_AudioControl* control = fAudioControl.Find(id);
-		// if (control->SubType() == USB_AUDIO_AC_OUTPUT_TERMINAL) {
-		// if (control->SubType() == USB_AUDIO_AC_INPUT_TERMINAL) {
-		//	USBTerminals.PushFront(control);
-		//	fStreams[i]->GetFormatsAndRates(Description);
-		// } else
-		// if (control->SubType() == IDSInputTerminal) {
-			USBTerminals.PushBack(control);
-			fStreams[i]->GetFormatsAndRates(&Description);
-		// }
+		USBTerminals.PushBack(fAudioControl.Find(fStreams[i]->TerminalLink()));
+		fStreams[i]->GetFormatsAndRates(&Description);
 	}
 
 	Vector<multi_channel_info> Channels;
 	fAudioControl.GetChannelsDescription(Channels, &Description, USBTerminals);
-	fAudioControl.GetBusChannelsDescription(Channels, &Description );
+	fAudioControl.GetBusChannelsDescription(Channels, &Description);
 
 	// Description.request_channel_count = channels + bus_channels;
 
@@ -812,7 +803,7 @@ Device::_SetupEndpoints()
 				{
 					Stream* stream = new(std::nothrow) Stream(this, i,
 						&config->interface[i]);
-					if (B_OK == stream->Init()) {
+					if (stream->Init() == B_OK) {
 						// put the stream in the correct order:
 						// first output that input ones.
 						if (stream->IsInput())