ALSA: HDA VIA: Change get_codec_type argument to hda_codec type
PATCH 2/30 ALSA: HDA VIA: Change get_codec_type argument to hda_codec type
From: Lydia Wang <[email protected]>
Subject: ALSA: HDA VIA: Change get_codec_type argument to hda_codec type
Signed-off-by Lydia Wang <[email protected]>
Signed-off-by Logan Li <[email protected]>
--- sound/pci/hda/patch_via.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/pci/hda/patch_via.c +4 -3
@@ -88,8 +88,9 @@ 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 dev_id = vendor_id &0xffff ;enum VIA_HDA_CODEC codec_type;
@@ -141,7 +142,7 @@struct hda_codec *codec =snd_kcontrol_chip (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 )) {if (size <4 *sizeof (unsigned int ))return -ENOMEM ;
@@ -163,7 +164,7 @@struct hda_codec *codec =snd_kcontrol_chip (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 )) { uinfo->type =SNDRV_CTL_ELEM_TYPE_INTEGER ; uinfo->count =2 ;