diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-30 19:08:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-30 19:08:06 +0200 |
| commit | 0ae3aba2865a5a6f5ee82e9651f0a69daf19d79c (patch) | |
| tree | ca4884719ad40ba247df7954d8d7cf86b9a01239 /sound/soc/qcom/lpass-cpu.c | |
| parent | 7241ea558c6715501e777396b5fc312c372e11d9 (diff) | |
| parent | d839c98f98826f0c13e46d5a4cecb46dd357b50e (diff) | |
Merge tag 'asoc-v4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.1
A few fixes for v4.1, none earth shattering and mostly driver related
except for one change to fix !PM builds for Intel platforms which is
done by adding stubs in the core so other platforms don't run into the
same issue.
Diffstat (limited to 'sound/soc/qcom/lpass-cpu.c')
| -rw-r--r-- | sound/soc/qcom/lpass-cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 6698d058de29..dc790abaa331 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -194,7 +194,7 @@ static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai); - int ret; + int ret = -EINVAL; switch (cmd) { case SNDRV_PCM_TRIGGER_START: |