Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

[firefly-linux-kernel-4.4.55.git] / sound / soc / soc-dapm.c

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 38281c2325ffef3f8581cc2bae80a338aa227942..016eba10b1ec2744a8b9b1b3492d6c0fa1c7a561 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3548,7 +3548,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
 
        default:
                WARN(1, "Unknown event %d\n", event);
-               return -EINVAL;
+               ret = -EINVAL;
        }
 
 out: