galaxys2-common: audio: fix merge fail
Change-Id: Icfdbe362c9dff887c96e5d65ecc94cca7bccd227
This commit is contained in:
parent
cd67b27666
commit
19ced56c2b
@ -790,8 +790,6 @@ int tinyalsa_mixer_set_route_list(struct tinyalsa_mixer *mixer, struct list_head
|
|||||||
} else {
|
} else {
|
||||||
rc = tinyalsa_mixer_set_route_ctrl(mixer, mixer_data);
|
rc = tinyalsa_mixer_set_route_ctrl(mixer, mixer_data);
|
||||||
if(rc < 0) {
|
if(rc < 0) {
|
||||||
ALOGE("Unable to set control!");
|
|
||||||
return -1;
|
|
||||||
ALOGE("Unable to set control!");
|
ALOGE("Unable to set control!");
|
||||||
goto list_continue;
|
goto list_continue;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user