diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:03:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:03:45 +0100 |
| commit | c1350bff69d13369c3316f5d5e580021c2196f90 (patch) | |
| tree | be4201ac6b08da33760a3650913875fa28de519d /sound/pci | |
| parent | Merge branch 'for-linus' into for-next (diff) | |
| download | linux-c1350bff69d13369c3316f5d5e580021c2196f90.tar.xz linux-c1350bff69d13369c3316f5d5e580021c2196f90.zip | |
ALSA: hda - Clean up ALC299 init code
ALC299 is compatible with ALC225/295, thus it doesn't have to assign
its own model. Merge together with ALC225/295 code.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8fd2d9c62c96..b2037131eed9 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6923,12 +6923,9 @@ static int patch_alc269(struct hda_codec *codec) break; case 0x10ec0225: case 0x10ec0295: - spec->codec_variant = ALC269_TYPE_ALC225; - spec->gen.mixer_nid = 0; /* no loopback on ALC225 ALC295 */ - break; case 0x10ec0299: spec->codec_variant = ALC269_TYPE_ALC225; - spec->gen.mixer_nid = 0; /* no loopback on ALC299 */ + spec->gen.mixer_nid = 0; /* no loopback on ALC225, ALC295 and ALC299 */ break; case 0x10ec0234: case 0x10ec0274: |