Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c

diff --cc sound/pci/hda/patch_realtek.c
index 14feecf2d8026bc07b176c577d132412f95dd265,cbde019d3d52b985e4c8a95b5f74386ac34eef69..63186d7d18a9b5896cfad9b3a307af1a6cb4ad19
--- 1/sound/pci/hda/patch_realtek.c
--- 2/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -278,8 -277,12 +278,14 @@@ static bool alc_dyn_adc_pcm_resetup(str
        return false;
  }
  
+ static inline hda_nid_t get_capsrc(struct alc_spec *spec, int idx)
+ {
+       return spec->capsrc_nids ?
+               spec->capsrc_nids[idx] : spec->adc_nids[idx];
+ }
+ 
 +static void call_update_outputs(struct hda_codec *codec);
 +
  /* select the given imux item; either unmute exclusively or select the route */
  static int alc_mux_select(struct hda_codec *codec, unsigned int adc_idx,
                          unsigned int idx, bool force)