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_analog.c | |
| parent | Merge branch 'for-linus' into for-next (diff) | |
| download | linux-dev-225068ab274dbd5c3a43fd80a6d553ccdf7b2c6f.tar.xz linux-dev-225068ab274dbd5c3a43fd80a6d553ccdf7b2c6f.zip | |
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_analog.c')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 231f89029779..c033a4ee6547 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -205,8 +205,6 @@ static int ad198x_parse_auto_config(struct hda_codec *codec, bool indep_hp) if (err < 0) return err; - codec->patch_ops = ad198x_auto_patch_ops; - return 0; } @@ -223,6 +221,7 @@ static int alloc_ad_spec(struct hda_codec *codec) return -ENOMEM; codec->spec = spec; snd_hda_gen_spec_init(&spec->gen); + codec->patch_ops = ad198x_auto_patch_ops; return 0; } |