From 19ced56c2bfe9aa4a15b375811a53614b5cb6ba6 Mon Sep 17 00:00:00 2001
From: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date: Sun, 26 May 2013 02:23:31 +0200
Subject: [PATCH] galaxys2-common: audio: fix merge fail

Change-Id: Icfdbe362c9dff887c96e5d65ecc94cca7bccd227
---
 tinyalsa_audio/mixer.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tinyalsa_audio/mixer.c b/tinyalsa_audio/mixer.c
index a3daaa2..a125e31 100644
--- a/tinyalsa_audio/mixer.c
+++ b/tinyalsa_audio/mixer.c
@@ -790,8 +790,6 @@ int tinyalsa_mixer_set_route_list(struct tinyalsa_mixer *mixer, struct list_head
 			} else {
 				rc = tinyalsa_mixer_set_route_ctrl(mixer, mixer_data);
 				if(rc < 0) {
-					ALOGE("Unable to set control!");
-					return -1;
 					ALOGE("Unable to set control!");
 					goto list_continue;
 				}