Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 111005
b: refs/heads/master
c: eb14a46
h: refs/heads/master
i:
  111003: 338d914
v: v3
  • Loading branch information
Harald Welte authored and Jaroslav Kysela committed Sep 9, 2008
1 parent 8e63af3 commit 7cf0da1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e8f18ae558b30783c2c0f6df32626fbc789ba6f6
refs/heads/master: eb14a46cf974c59aadef8c120b7dfcb27bc81f24
16 changes: 8 additions & 8 deletions trunk/sound/pci/hda/patch_via.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ enum {
};

enum {
AUTO_SEQ_FRONT,
AUTO_SEQ_FRONT = 0,
AUTO_SEQ_SURROUND,
AUTO_SEQ_CENLFE,
AUTO_SEQ_SIDE
Expand Down Expand Up @@ -283,11 +283,11 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
0x18, &spec->cur_mux[adc_idx]);
else if ((IS_VT1709_10CH_VENDORID(vendor_id) ||
IS_VT1709_6CH_VENDORID(vendor_id)) && adc_idx == 0)
IS_VT1709_6CH_VENDORID(vendor_id)) && (adc_idx == 0))
return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
0x19, &spec->cur_mux[adc_idx]);
else if ((IS_VT1708B_8CH_VENDORID(vendor_id) ||
IS_VT1708B_4CH_VENDORID(vendor_id)) && adc_idx == 0)
IS_VT1708B_4CH_VENDORID(vendor_id)) && (adc_idx == 0))
return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
0x17, &spec->cur_mux[adc_idx]);
else
Expand Down Expand Up @@ -897,7 +897,7 @@ static int patch_vt1708(struct hda_codec *codec)
int err;

/* create a codec specific record */
spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
if (spec == NULL)
return -ENOMEM;

Expand Down Expand Up @@ -1360,7 +1360,7 @@ static int patch_vt1709_10ch(struct hda_codec *codec)
int err;

/* create a codec specific record */
spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
if (spec == NULL)
return -ENOMEM;

Expand Down Expand Up @@ -1451,7 +1451,7 @@ static int patch_vt1709_6ch(struct hda_codec *codec)
int err;

/* create a codec specific record */
spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
if (spec == NULL)
return -ENOMEM;

Expand Down Expand Up @@ -1890,7 +1890,7 @@ static int patch_vt1708B_8ch(struct hda_codec *codec)
int err;

/* create a codec specific record */
spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
if (spec == NULL)
return -ENOMEM;

Expand Down Expand Up @@ -1939,7 +1939,7 @@ static int patch_vt1708B_4ch(struct hda_codec *codec)
int err;

/* create a codec specific record */
spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
if (spec == NULL)
return -ENOMEM;

Expand Down

0 comments on commit 7cf0da1

Please sign in to comment.