From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 23 Nov 2011 16:08:42 +0000 (+0100)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b37c0096b448d099d304bb47c4eada9117dba4cf;p=linux-beck.git

Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c
---

b37c0096b448d099d304bb47c4eada9117dba4cf
diff --cc sound/pci/hda/patch_realtek.c
index 14feecf2d802,cbde019d3d52..63186d7d18a9
--- a/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)