Index: uspace/srv/audio/hound/audio_device.c
===================================================================
--- uspace/srv/audio/hound/audio_device.c	(revision 5b0cf635022b821f28f7a014ad5b39d005cd7666)
+++ uspace/srv/audio/hound/audio_device.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -263,4 +263,7 @@
 static void device_event_callback(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
+	struct timeval time1;
+	errno_t ret;
+
 	/* Answer initial request */
 	async_answer_0(iid, EOK);
@@ -272,6 +275,5 @@
 		async_answer_0(callid, EOK);
 		switch(IPC_GET_IMETHOD(call)) {
-		case PCM_EVENT_FRAMES_PLAYED: {
-			struct timeval time1;
+		case PCM_EVENT_FRAMES_PLAYED:
 			getuptime(&time1);
 			//TODO add underrun detection.
@@ -285,9 +287,8 @@
 			    tv_sub_diff(&time2, &time1));
 			break;
-		}
-		case PCM_EVENT_CAPTURE_TERMINATED: {
+		case PCM_EVENT_CAPTURE_TERMINATED:
 			log_verbose("Capture terminated");
 			dev->source.format = AUDIO_FORMAT_ANY;
-			const errno_t ret = release_buffer(dev);
+			ret = release_buffer(dev);
 			if (ret != EOK) {
 				log_error("Failed to release buffer: %s",
@@ -296,9 +297,8 @@
 			audio_pcm_unregister_event_callback(dev->sess);
 			break;
-		}
-		case PCM_EVENT_PLAYBACK_TERMINATED: {
+		case PCM_EVENT_PLAYBACK_TERMINATED:
 			log_verbose("Playback Terminated");
 			dev->sink.format = AUDIO_FORMAT_ANY;
-			const errno_t ret = release_buffer(dev);
+			ret = release_buffer(dev);
 			if (ret != EOK) {
 				log_error("Failed to release buffer: %s",
@@ -307,7 +307,6 @@
 			audio_pcm_unregister_event_callback(dev->sess);
 			break;
-		}
-		case PCM_EVENT_FRAMES_CAPTURED: {
-			const errno_t ret = audio_source_push_data(&dev->source,
+		case PCM_EVENT_FRAMES_CAPTURED:
+			ret = audio_source_push_data(&dev->source,
 			    dev->buffer.position, dev->buffer.fragment_size);
 			advance_buffer(dev, dev->buffer.fragment_size);
@@ -315,10 +314,8 @@
 				log_warning("Failed to push recorded data");
 			break;
-		}
 		case 0:
 			log_info("Device event callback hangup");
 			return;
 		}
-
 	}
 }