diff options
| author | Takashi Iwai | 2012-11-22 21:22:39 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2012-11-22 21:22:39 +0100 |
| commit | 2ba509a6baac097cc8ae4f9741a09ba7c1c0d916 (patch) | |
| tree | 08470935de327cb438cc9ec738b0e025c3c0b556 /sound/pci/hda | |
| parent | ALSA: emu10k1: Add missing ifdef for emu->suspend reference (diff) | |
| parent | ALSA: snd-usb: properly initialize the sync endpoint (diff) | |
| download | kernel-qcow2-linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.tar.gz kernel-qcow2-linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.tar.xz kernel-qcow2-linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/hda')
| -rw-r--r-- | sound/pci/hda/patch_cirrus.c | 1 | ||||
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index f99cbf942b8d..ed981723cdd5 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -473,6 +473,7 @@ static int parse_output(struct hda_codec *codec) memcpy(cfg->speaker_pins, cfg->line_out_pins, sizeof(cfg->speaker_pins)); cfg->line_outs = 0; + memset(cfg->line_out_pins, 0, sizeof(cfg->line_out_pins)); } return 0; diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index bde7d1b323cd..af0686533803 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -7098,6 +7098,7 @@ static const struct hda_codec_preset snd_hda_preset_realtek[] = { { .id = 0x10ec0282, .name = "ALC282", .patch = patch_alc269 }, { .id = 0x10ec0283, .name = "ALC283", .patch = patch_alc269 }, { .id = 0x10ec0290, .name = "ALC290", .patch = patch_alc269 }, + { .id = 0x10ec0292, .name = "ALC292", .patch = patch_alc269 }, { .id = 0x10ec0861, .rev = 0x100340, .name = "ALC660", .patch = patch_alc861 }, { .id = 0x10ec0660, .name = "ALC660-VD", .patch = patch_alc861vd }, |