diff options
| author |  Mark Brown <broonie@kernel.org>
| 2017-11-10 21:30:50 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org>
| 2017-11-10 21:30:50 +0000 |
| commit | aa38bff80896e3918f357816a79a9b4a1d375c56 (patch) | |
| tree | 125e0c5833611d5d791d9019181404df78d1b630 /sound/soc/soc-dapm.c | |
| parent | Merge remote-tracking branch 'asoc/topic/component' into asoc-next (diff) | |
| parent | ASoC: add snd_soc_dapm_kcontrol_component() (diff) | |
| download | linux-aa38bff80896e3918f357816a79a9b4a1d375c56.tar.gz linux-aa38bff80896e3918f357816a79a9b4a1d375c56.tar.bz2 linux-aa38bff80896e3918f357816a79a9b4a1d375c56.zip | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index dcef67a9bd48..9d4748e2b67a 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3681,7 +3681,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, switch (event) { case SND_SOC_DAPM_PRE_PMU: substream.stream = SNDRV_PCM_STREAM_CAPTURE; - if (source->driver->ops && source->driver->ops->startup) { + if (source->driver->ops->startup) { ret = source->driver->ops->startup(&substream, source); if (ret < 0) { dev_err(source->dev, @@ -3695,7 +3695,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, goto out; substream.stream = SNDRV_PCM_STREAM_PLAYBACK; - if (sink->driver->ops && sink->driver->ops->startup) { + if (sink->driver->ops->startup) { ret = sink->driver->ops->startup(&substream, sink); if (ret < 0) { dev_err(sink->dev, @@ -3725,13 +3725,13 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, ret = 0; source->active--; - if (source->driver->ops && source->driver->ops->shutdown) { + if (source->driver->ops->shutdown) { substream.stream = SNDRV_PCM_STREAM_CAPTURE; source->driver->ops->shutdown(&substream, source); } sink->active--; - if (sink->driver->ops && sink->driver->ops->shutdown) { + if (sink->driver->ops->shutdown) { substream.stream = SNDRV_PCM_STREAM_PLAYBACK; sink->driver->ops->shutdown(&substream, sink); } |