diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-05-16 09:13:08 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-05-16 09:13:08 +0200 |
commit | 581abbaa03367f0b1327521f30bd2b69b8075b2f (patch) | |
tree | 686db8cee890fa97061baf5722c3bb9344e658dc /sound/pci/hda/hda_generic.c | |
parent | 84add303ef950b8d85f54bc2248c2bc73467c329 (diff) | |
parent | 639db596165746ca87bbcb56559b094fd9042890 (diff) | |
download | linux-581abbaa03367f0b1327521f30bd2b69b8075b2f.tar.bz2 |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_generic.c')
-rw-r--r-- | sound/pci/hda/hda_generic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index dfaf1a93fb8a..320445f3bf73 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -5434,6 +5434,7 @@ static int dyn_adc_capture_pcm_prepare(struct hda_pcm_stream *hinfo, spec->cur_adc_stream_tag = stream_tag; spec->cur_adc_format = format; snd_hda_codec_setup_stream(codec, spec->cur_adc, stream_tag, 0, format); + call_pcm_capture_hook(hinfo, codec, substream, HDA_GEN_PCM_ACT_PREPARE); return 0; } @@ -5444,6 +5445,7 @@ static int dyn_adc_capture_pcm_cleanup(struct hda_pcm_stream *hinfo, struct hda_gen_spec *spec = codec->spec; snd_hda_codec_cleanup_stream(codec, spec->cur_adc); spec->cur_adc = 0; + call_pcm_capture_hook(hinfo, codec, substream, HDA_GEN_PCM_ACT_CLEANUP); return 0; } |