diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-12 21:48:29 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-12 21:48:29 +0300 |
| commit | 89a88dd3d6823f46bfb1405c4b358f89d5526cd6 (patch) | |
| tree | a1b6550b08da296aa14e8f59fe97ada6c67d5f63 /sound/soc/soc-pcm.c | |
| parent | 3eaecb4b50693378bb55cc633992e7f72be35687 (diff) | |
| parent | d7e3281b52fea8917fb4a7a5b09df5e6a9d2850c (diff) | |
| download | linux-89a88dd3d6823f46bfb1405c4b358f89d5526cd6.tar.xz | |
Merge tag 'asoc-v4.1' into asoc-next
ASoC: Changes for v4.1
A selection of changes for v4.1 so far. The main things are:
- Move of jack registration to the card where it belongs.
- Support for DAPM routes specified by both the machine driver and DT.
# gpg: Signature made Thu 05 Mar 2015 01:10:27 GMT using RSA key ID 5D5487D0
# gpg: WARNING: digest algorithm MD5 is deprecated
# gpg: please see https://gnupg.org/faq/weak-digest-algos.html for more information
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg: aka "Mark Brown <broonie@debian.org>"
# gpg: aka "Mark Brown <broonie@kernel.org>"
# gpg: aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg: aka "Mark Brown <broonie@linaro.org>"
# gpg: aka "Mark Brown <Mark.Brown@linaro.org>"
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 6b0136e7cb88..6e3781e88f9a 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2511,6 +2511,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) /* DAPM dai link stream work */ INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work); + pcm->nonatomic = rtd->dai_link->nonatomic; rtd->pcm = pcm; pcm->private_data = rtd; |