diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-03-30 20:03:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-03-30 20:03:25 +0200 |
| commit | 9dfcce42b09cde01b2b1f5527ed91112a04a8ab0 (patch) | |
| tree | f9519c7144c13e7e038615a2697b81abe12384c1 /sound/soc/soc-core.c | |
| parent | 2d7d54002e396c180db0c800c1046f0a3c471597 (diff) | |
| parent | 2ddaa6762696db4bb35726063b421782a9e0436f (diff) | |
| download | linux-9dfcce42b09cde01b2b1f5527ed91112a04a8ab0.tar.gz linux-9dfcce42b09cde01b2b1f5527ed91112a04a8ab0.tar.bz2 linux-9dfcce42b09cde01b2b1f5527ed91112a04a8ab0.zip | |
Merge tag 'asoc-fix-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.11
A relatively large pile of fixes for mainline, the first since the merge
window. The biggest block of changes here by volume is the sun8i-codec
set, the driver was newly added in the merge window but it was realized
that renaming some of the user visible controls was required so these
are being pushed for v4.11 to avoid the original code appearing in a
release. Otherwise it's all fairly standard bugfix stuff.
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 6dca408faae3..2722bb0c5573 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3326,7 +3326,10 @@ static int snd_soc_platform_drv_pcm_new(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_platform *platform = rtd->platform; - return platform->driver->pcm_new(rtd); + if (platform->driver->pcm_new) + return platform->driver->pcm_new(rtd); + else + return 0; } static void snd_soc_platform_drv_pcm_free(struct snd_pcm *pcm) @@ -3334,7 +3337,8 @@ static void snd_soc_platform_drv_pcm_free(struct snd_pcm *pcm) struct snd_soc_pcm_runtime *rtd = pcm->private_data; struct snd_soc_platform *platform = rtd->platform; - platform->driver->pcm_free(pcm); + if (platform->driver->pcm_free) + platform->driver->pcm_free(pcm); } /** |