Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 16157
b: refs/heads/master
c: a3bcba3
h: refs/heads/master
i:
  16155: 4eb68e2
v: v3
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Jan 3, 2006
1 parent 500f578 commit 09cdec1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c5f2ea08fbd8911e2c975094780d2b16e65f27e0
refs/heads/master: a3bcba384c2f2448ad204ea52baa15f1227d0d40
9 changes: 8 additions & 1 deletion trunk/sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -2678,6 +2678,9 @@ static struct hda_pcm_stream alc260_pcm_analog_capture = {
.channels_max = 2,
};

#define alc260_pcm_digital_playback alc880_pcm_digital_playback
#define alc260_pcm_digital_capture alc880_pcm_digital_capture

/*
* for BIOS auto-configuration
*/
Expand Down Expand Up @@ -3041,6 +3044,10 @@ static int patch_alc260(struct hda_codec *codec)
spec->stream_analog_playback = &alc260_pcm_analog_playback;
spec->stream_analog_capture = &alc260_pcm_analog_capture;

spec->stream_name_digital = "ALC260 Digital";
spec->stream_digital_playback = &alc260_pcm_digital_playback;
spec->stream_digital_capture = &alc260_pcm_digital_capture;

codec->patch_ops = alc_patch_ops;
if (board_config == ALC260_AUTO)
codec->patch_ops.init = alc260_auto_init;
Expand Down Expand Up @@ -3927,7 +3934,7 @@ static struct alc_config_preset alc262_presets[] = {
.hp_nid = 0x03,
.num_channel_mode = ARRAY_SIZE(alc262_modes),
.channel_mode = alc262_modes,
.input_mux = alc262_capture_source,
.input_mux = &alc262_capture_source,
},
};

Expand Down

0 comments on commit 09cdec1

Please sign in to comment.