summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-05-26 02:23:31 +0200
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-05-26 02:23:31 +0200
commit19ced56c2bfe9aa4a15b375811a53614b5cb6ba6 (patch)
tree24e9af48367d11673ee8afa6f589528fc3a2f026
parentcd67b27666daae2a99d22af7644f3522866049ce (diff)
downloaddevice_samsung_galaxys2-common-19ced56c2bfe9aa4a15b375811a53614b5cb6ba6.zip
device_samsung_galaxys2-common-19ced56c2bfe9aa4a15b375811a53614b5cb6ba6.tar.gz
device_samsung_galaxys2-common-19ced56c2bfe9aa4a15b375811a53614b5cb6ba6.tar.bz2
galaxys2-common: audio: fix merge fail
Change-Id: Icfdbe362c9dff887c96e5d65ecc94cca7bccd227
-rw-r--r--tinyalsa_audio/mixer.c2
1 files changed, 0 insertions, 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
@@ -791,8 +791,6 @@ int tinyalsa_mixer_set_route_list(struct tinyalsa_mixer *mixer, struct list_head
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;
}
}