summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2012-10-16 11:35:00 +0200
committerDavid Henningsson <david.henningsson@canonical.com>2012-10-24 12:40:26 +0200
commit63ddc0e426845d3016d34a7dd8785ce559d63116 (patch)
treed66bd515f1fd53b96002a5712f654abbe10be738
parent2a33b07d69a5c08b3325ca3f1ec40f428c659ce5 (diff)
alsa-mixer: Don't let "Mic Jack Mode" alone create a "Line In" path
The IDT/Sigmatel codec driver often creates a "Mic Jack Mode" for every mic jack, so it can change functionality between Mic and Line In. However, as the "Mic Jack" is the standard naming, our current solution does not make the Line In port unavailable when nothing is plugged in. This patch makes the "Line In" port not to be created just because there is a "Mic Jack Mode" that could be set to "Line". This makes the behaviour consistent with e g "Dock Mic Jack Mode", "Front Mic Jack Mode" etc, where we don't create a "Dock Line" or "Dock Mic" port either. Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-rw-r--r--src/modules/alsa/mixer/paths/analog-input-linein.conf1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-input-linein.conf b/src/modules/alsa/mixer/paths/analog-input-linein.conf
index 6abafcb9..3bcf4361 100644
--- a/src/modules/alsa/mixer/paths/analog-input-linein.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-linein.conf
@@ -123,5 +123,4 @@ enumeration = select
[Option Mic Jack Mode:Line In]
priority = 19
-required-any = any
name = input-linein