diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2011-10-05 15:53:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-05 17:22:04 +0200 |
| commit | 7c2f8e4009d4b66c8458e3a5c20510b4262853bb (patch) | |
| tree | 5958ddebda59e7822890f66275787d134fa1543b /sound | |
| parent | 48718eab5a719cb537466124d9585b3066e27fae (diff) | |
| download | op-kernel-dev-7c2f8e4009d4b66c8458e3a5c20510b4262853bb.zip op-kernel-dev-7c2f8e4009d4b66c8458e3a5c20510b4262853bb.tar.gz | |
ALSA: jack - Add "Line In" input jack constants
Similar to Line Out, these constants form the base for future
patches enabling input jack reporting for Line in jacks.
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/jack.c | 1 | ||||
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sound/core/jack.c b/sound/core/jack.c index 53b53e9..240a3e1 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -30,6 +30,7 @@ static int jack_switch_types[] = { SW_LINEOUT_INSERT, SW_JACK_PHYSICAL_INSERT, SW_VIDEOOUT_INSERT, + SW_LINEIN_INSERT, }; static int snd_jack_dev_free(struct snd_device *device) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index e3db196..8b046a1 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -5264,6 +5264,8 @@ static const char *get_jack_default_name(struct hda_codec *codec, hda_nid_t nid, return "Mic"; case SND_JACK_LINEOUT: return "Line-out"; + case SND_JACK_LINEIN: + return "Line-in"; case SND_JACK_HEADSET: return "Headset"; case SND_JACK_VIDEOOUT: |
