diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-05-29 10:42:14 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-05-29 10:42:14 +0200 |
commit | 225068ab274dbd5c3a43fd80a6d553ccdf7b2c6f (patch) | |
tree | b9832b957377c6bfe5c6bce56b29a2eff03f3072 /sound/pci/hda/patch_conexant.c | |
parent | 984a8547052711867332eeaec4141755fc040553 (diff) | |
download | linux-225068ab274dbd5c3a43fd80a6d553ccdf7b2c6f.tar.bz2 |
ALSA: hda - Set patch_ops before calling auto-parser
... so that the parser code can overwrite some optional ops. For
Realtek and others, it can be set solely in the spec allocator, so it
results in a good code cleanup, too.
With this change, we can finally remove the local stream_pm setup and
rely on the generic parser's automatic setting.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
-rw-r--r-- | sound/pci/hda/patch_conexant.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 78b719b5b34d..f788a91b544a 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -850,6 +850,7 @@ static int patch_conexant_auto(struct hda_codec *codec) return -ENOMEM; snd_hda_gen_spec_init(&spec->gen); codec->spec = spec; + codec->patch_ops = cx_auto_patch_ops; cx_auto_parse_beep(codec); cx_auto_parse_eapd(codec); @@ -908,8 +909,6 @@ static int patch_conexant_auto(struct hda_codec *codec) if (err < 0) goto error; - codec->patch_ops = cx_auto_patch_ops; - /* Some laptops with Conexant chips show stalls in S3 resume, * which falls into the single-cmd mode. * Better to make reset, then. |