diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-27 15:40:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-27 15:40:47 +0100 |
| commit | 38f7d75edcf8ced03d03131005ed806bee746699 (patch) | |
| tree | 1baf728abcc490365f499eef8c1b35b25435da5a /sound/soc/soc-pcm.c | |
| parent | c22cff947a98ecd10c42974a39ced1819e5c868a (diff) | |
| parent | 34742cb02bd368c1af3349c041d3e4446f7ac6ef (diff) | |
| download | lwn-38f7d75edcf8ced03d03131005ed806bee746699.tar.gz lwn-38f7d75edcf8ced03d03131005ed806bee746699.zip | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-core
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index f4f68cb3cb00..fb70fbe26862 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1833,18 +1833,10 @@ static int dpcm_run_old_update(struct snd_soc_pcm_runtime *fe, int stream) /* Called by DAPM mixer/mux changes to update audio routing between PCMs and * any DAI links. */ -int soc_dpcm_runtime_update(struct snd_soc_dapm_widget *widget) +int soc_dpcm_runtime_update(struct snd_soc_card *card) { - struct snd_soc_card *card; int i, old, new, paths; - if (widget->codec) - card = widget->codec->card; - else if (widget->platform) - card = widget->platform->card; - else - return -EINVAL; - mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_RUNTIME); for (i = 0; i < card->num_rtd; i++) { struct snd_soc_dapm_widget_list *list; |