diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-09-16 08:29:04 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-09-16 08:29:04 +0200 |
commit | 0308110615acb4b6409fe042caf22bb9fb075d85 (patch) | |
tree | d129f11ebdbe49b21246a72e6ba52c50e81e8e7e /sound/pci/hda/patch_cirrus.c | |
parent | c731bc96ad641a5fa3d50a87b474652505507282 (diff) | |
parent | 763437a9e7737535b2fc72175ad4974048769be6 (diff) | |
download | op-kernel-dev-0308110615acb4b6409fe042caf22bb9fb075d85.zip op-kernel-dev-0308110615acb4b6409fe042caf22bb9fb075d85.tar.gz |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
-rw-r--r-- | sound/pci/hda/patch_cirrus.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 47d6ffc..c45f3e6 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -375,7 +375,7 @@ static int is_ext_mic(struct hda_codec *codec, unsigned int idx) static hda_nid_t get_adc(struct hda_codec *codec, hda_nid_t pin, unsigned int *idxp) { - int i; + int i, idx; hda_nid_t nid; nid = codec->start_nid; @@ -384,9 +384,11 @@ static hda_nid_t get_adc(struct hda_codec *codec, hda_nid_t pin, type = get_wcaps_type(get_wcaps(codec, nid)); if (type != AC_WID_AUD_IN) continue; - *idxp = snd_hda_get_conn_index(codec, nid, pin, false); - if (*idxp >= 0) + idx = snd_hda_get_conn_index(codec, nid, pin, false); + if (idx >= 0) { + *idxp = idx; return nid; + } } return 0; } @@ -533,7 +535,7 @@ static int add_volume(struct hda_codec *codec, const char *name, int index, unsigned int pval, int dir, struct snd_kcontrol **kctlp) { - char tmp[32]; + char tmp[44]; struct snd_kcontrol_new knew = HDA_CODEC_VOLUME_IDX(tmp, index, 0, 0, HDA_OUTPUT); knew.private_value = pval; |