diff options
author | 2020-07-08 11:38:59 +0200 | |
---|---|---|
committer | 2020-07-08 11:38:59 +0200 | |
commit | faa2fd7cbad4609d06d7904c0a80cf2f8cd23678 (patch) | |
tree | 3a5bfcc8879b719aec97cb73ed6e020cde502546 /sound/soc/soc-pcm.c | |
parent | sched/core: Remove mmdrop() definition (diff) | |
parent | sched: Fix unreliable rseq cpu_id for new tasks (diff) | |
download | wireguard-linux-faa2fd7cbad4609d06d7904c0a80cf2f8cd23678.tar.xz wireguard-linux-faa2fd7cbad4609d06d7904c0a80cf2f8cd23678.zip |
Merge branch 'sched/urgent'
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r-- | sound/soc/soc-pcm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 2c114b4542ce..c517064f5391 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2630,15 +2630,15 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new) int count, paths; int ret; + if (!fe->dai_link->dynamic) + return 0; + if (fe->num_cpus > 1) { dev_err(fe->dev, "%s doesn't support Multi CPU yet\n", __func__); return -EINVAL; } - if (!fe->dai_link->dynamic) - return 0; - /* only check active links */ if (!snd_soc_dai_active(asoc_rtd_to_cpu(fe, 0))) return 0; |