adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

ALSA: HDA VIA: Change get_codec_type argument to hda_codec type

Browse source 
Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: Logan Li <loganli@viatech.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Lydia Wang 2009-10-10 19:07:26 +08:00 committed by Takashi Iwai
parent b6153e1175
commit 744ff5f487
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sound/pci/hda/patch_via.c
View file

@ -88,8 +88,9 @@ enum VIA_HDA_CODEC {
CODEC_TYPES, CODEC_TYPES,
}; };
static enum VIA_HDA_CODEC get_codec_type(u32 vendor_id) static enum VIA_HDA_CODEC get_codec_type(struct hda_codec *codec)
{ {
u32 vendor_id = codec->vendor_id;
u16 ven_id = vendor_id >> 16; u16 ven_id = vendor_id >> 16;
u16 dev_id = vendor_id & 0xffff; u16 dev_id = vendor_id & 0xffff;
enum VIA_HDA_CODEC codec_type; enum VIA_HDA_CODEC codec_type;
@ -141,7 +142,7 @@ static int mic_boost_tlv(struct snd_kcontrol *kcontrol, int op_flag,
struct hda_codec *codec = snd_kcontrol_chip(kcontrol); struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
hda_nid_t nid = get_amp_nid(kcontrol); hda_nid_t nid = get_amp_nid(kcontrol);
if (get_codec_type(codec->vendor_id) == VT1708S if (get_codec_type(codec) == VT1708S
&& (nid == 0x1a || nid == 0x1e)) { && (nid == 0x1a || nid == 0x1e)) {
if (size < 4 * sizeof(unsigned int)) if (size < 4 * sizeof(unsigned int))
return -ENOMEM; return -ENOMEM;
@ -163,7 +164,7 @@ static int mic_boost_volume_info(struct snd_kcontrol *kcontrol,
struct hda_codec *codec = snd_kcontrol_chip(kcontrol); struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
hda_nid_t nid = get_amp_nid(kcontrol); hda_nid_t nid = get_amp_nid(kcontrol);
if (get_codec_type(codec->vendor_id) == VT1708S if (get_codec_type(codec) == VT1708S
&& (nid == 0x1a || nid == 0x1e)) { && (nid == 0x1a || nid == 0x1e)) {
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 2; uinfo->count = 2;