summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_analog.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-01-13 13:35:28 +0100
committerIngo Molnar <mingo@kernel.org>2014-01-13 13:35:28 +0100
commit56b4811039174bba9cbd68318d0d8b1585b9eded (patch)
treef3e8f99e85e545662d82e18bef2a7009c2948852 /sound/pci/hda/patch_analog.c
parente777b63bbd589248eb151a3191ee92331a701385 (diff)
parent9722c2dac708e9468cc0dc30218ef76946ffbc9d (diff)
downloadop-kernel-dev-56b4811039174bba9cbd68318d0d8b1585b9eded.zip
op-kernel-dev-56b4811039174bba9cbd68318d0d8b1585b9eded.tar.gz
Merge branch 'sched/urgent' into sched/core
Pick up the latest fixes before applying new changes. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
-rw-r--r--sound/pci/hda/patch_analog.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index cac015b..699262a 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -340,6 +340,14 @@ static int patch_ad1986a(struct hda_codec *codec)
{
int err;
struct ad198x_spec *spec;
+ static hda_nid_t preferred_pairs[] = {
+ 0x1a, 0x03,
+ 0x1b, 0x03,
+ 0x1c, 0x04,
+ 0x1d, 0x05,
+ 0x1e, 0x03,
+ 0
+ };
err = alloc_ad_spec(codec);
if (err < 0)
@@ -360,6 +368,8 @@ static int patch_ad1986a(struct hda_codec *codec)
* So, let's disable the shared stream.
*/
spec->gen.multiout.no_share_stream = 1;
+ /* give fixed DAC/pin pairs */
+ spec->gen.preferred_dacs = preferred_pairs;
/* AD1986A can't manage the dynamic pin on/off smoothly */
spec->gen.auto_mute_via_amp = 1;
OpenPOWER on IntegriCloud