diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-15 08:33:56 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-15 08:33:56 -0400 |
| commit | 18c5ef385c65360761f39d55b2e2cd370ab151db (patch) | |
| tree | 51ffa37ad94600f908867196dd9f216e42163de7 /sound/pci/hda/patch_conexant.c | |
| parent | 38d7b08f374b640b00d350ac2d12ffed5d723423 (diff) | |
| parent | f0cea79724f03ee55e7b5933b6a6f6a3fd177710 (diff) | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index f7e234e5ee96..31b5d9eeba68 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
| @@ -1733,7 +1733,7 @@ static void cxt5051_portc_automic(struct hda_codec *codec) | |||
| 1733 | new_adc = spec->adc_nids[spec->cur_adc_idx]; | 1733 | new_adc = spec->adc_nids[spec->cur_adc_idx]; |
| 1734 | if (spec->cur_adc && spec->cur_adc != new_adc) { | 1734 | if (spec->cur_adc && spec->cur_adc != new_adc) { |
| 1735 | /* stream is running, let's swap the current ADC */ | 1735 | /* stream is running, let's swap the current ADC */ |
| 1736 | snd_hda_codec_cleanup_stream(codec, spec->cur_adc); | 1736 | __snd_hda_codec_cleanup_stream(codec, spec->cur_adc, 1); |
| 1737 | spec->cur_adc = new_adc; | 1737 | spec->cur_adc = new_adc; |
| 1738 | snd_hda_codec_setup_stream(codec, new_adc, | 1738 | snd_hda_codec_setup_stream(codec, new_adc, |
| 1739 | spec->cur_adc_stream_tag, 0, | 1739 | spec->cur_adc_stream_tag, 0, |