diff options
author | Jaroslav Kysela <perex@perex.cz> | 2010-02-16 05:19:18 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2010-02-16 05:19:18 -0500 |
commit | ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0 (patch) | |
tree | d83637979db83bb9d5a23e190148b90b60c976d2 /sound/pci/hda/patch_analog.c | |
parent | d39e82db73eb876c60d00f00219d767b3be30307 (diff) | |
parent | f167e1d073278fe231bbdd5d6c24fb9d091aa544 (diff) |
Merge branch 'fixes' into devel
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
-rw-r--r-- | sound/pci/hda/patch_analog.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 865715e3f938..214301d568fa 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
@@ -1276,6 +1276,8 @@ static int patch_ad1986a(struct hda_codec *codec) | |||
1276 | */ | 1276 | */ |
1277 | spec->multiout.no_share_stream = 1; | 1277 | spec->multiout.no_share_stream = 1; |
1278 | 1278 | ||
1279 | codec->no_trigger_sense = 1; | ||
1280 | |||
1279 | return 0; | 1281 | return 0; |
1280 | } | 1282 | } |
1281 | 1283 | ||
@@ -1461,6 +1463,8 @@ static int patch_ad1983(struct hda_codec *codec) | |||
1461 | 1463 | ||
1462 | codec->patch_ops = ad198x_patch_ops; | 1464 | codec->patch_ops = ad198x_patch_ops; |
1463 | 1465 | ||
1466 | codec->no_trigger_sense = 1; | ||
1467 | |||
1464 | return 0; | 1468 | return 0; |
1465 | } | 1469 | } |
1466 | 1470 | ||
@@ -1904,6 +1908,9 @@ static int patch_ad1981(struct hda_codec *codec) | |||
1904 | codec->patch_ops.unsol_event = ad1981_hp_unsol_event; | 1908 | codec->patch_ops.unsol_event = ad1981_hp_unsol_event; |
1905 | break; | 1909 | break; |
1906 | } | 1910 | } |
1911 | |||
1912 | codec->no_trigger_sense = 1; | ||
1913 | |||
1907 | return 0; | 1914 | return 0; |
1908 | } | 1915 | } |
1909 | 1916 | ||
@@ -3220,6 +3227,8 @@ static int patch_ad1988(struct hda_codec *codec) | |||
3220 | #endif | 3227 | #endif |
3221 | spec->vmaster_nid = 0x04; | 3228 | spec->vmaster_nid = 0x04; |
3222 | 3229 | ||
3230 | codec->no_trigger_sense = 1; | ||
3231 | |||
3223 | return 0; | 3232 | return 0; |
3224 | } | 3233 | } |
3225 | 3234 | ||
@@ -3432,6 +3441,8 @@ static int patch_ad1884(struct hda_codec *codec) | |||
3432 | 3441 | ||
3433 | codec->patch_ops = ad198x_patch_ops; | 3442 | codec->patch_ops = ad198x_patch_ops; |
3434 | 3443 | ||
3444 | codec->no_trigger_sense = 1; | ||
3445 | |||
3435 | return 0; | 3446 | return 0; |
3436 | } | 3447 | } |
3437 | 3448 | ||
@@ -4392,6 +4403,8 @@ static int patch_ad1884a(struct hda_codec *codec) | |||
4392 | break; | 4403 | break; |
4393 | } | 4404 | } |
4394 | 4405 | ||
4406 | codec->no_trigger_sense = 1; | ||
4407 | |||
4395 | return 0; | 4408 | return 0; |
4396 | } | 4409 | } |
4397 | 4410 | ||
@@ -4728,6 +4741,9 @@ static int patch_ad1882(struct hda_codec *codec) | |||
4728 | spec->mixers[2] = ad1882_6stack_mixers; | 4741 | spec->mixers[2] = ad1882_6stack_mixers; |
4729 | break; | 4742 | break; |
4730 | } | 4743 | } |
4744 | |||
4745 | codec->no_trigger_sense = 1; | ||
4746 | |||
4731 | return 0; | 4747 | return 0; |
4732 | } | 4748 | } |
4733 | 4749 | ||