projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8b940fc
6107159
)
Merge branch 'fix/hda' into topic/hda
author
Takashi Iwai
<tiwai@suse.de>
Wed, 23 Nov 2011 16:08:42 +0000
(17:08 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Wed, 23 Nov 2011 16:08:42 +0000
(17:08 +0100)
Conflicts:
sound/pci/hda/patch_realtek.c
1
2
sound/pci/hda/patch_realtek.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sound/pci/hda/patch_realtek.c
index
14feecf
,
cbde019
..
63186d7
---
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)