alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: David Henningsson <david.henningsson@canonical.com>
To: tiwai@suse.de, alsa-devel@alsa-project.org, ian_minett@creativelabs.com
Cc: David Henningsson <david.henningsson@canonical.com>
Subject: [PATCH 1/2] ALSA: hda - Fix "Line" and "Mic" names for CA0132
Date: Mon, 20 Aug 2012 11:16:59 +0200	[thread overview]
Message-ID: <1345454220-4233-2-git-send-email-david.henningsson@canonical.com> (raw)
In-Reply-To: <1345454220-4233-1-git-send-email-david.henningsson@canonical.com>

The names "Line-In" and "Mic-In" are nonstandard. Standard names
make them controllable by e g PulseAudio.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/patch_ca0132.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index d0d3540..2685590 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -988,12 +988,12 @@ static void ca0132_config(struct hda_codec *codec)
 
 	/* Mic-in */
 	spec->input_pins[0] = 0x12;
-	spec->input_labels[0] = "Mic-In";
+	spec->input_labels[0] = "Mic";
 	spec->adcs[0] = 0x07;
 
 	/* Line-In */
 	spec->input_pins[1] = 0x11;
-	spec->input_labels[1] = "Line-In";
+	spec->input_labels[1] = "Line";
 	spec->adcs[1] = 0x08;
 	spec->num_inputs = 2;
 }
-- 
1.7.9.5

  reply	other threads:[~2012-08-20  8:47 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-20  9:16 [PATCH 0/2] Two fixes for ca0132 David Henningsson
2012-08-20  9:16 ` David Henningsson [this message]
2012-08-20  9:17 ` [PATCH 2/2] ALSA: hda - don't create dysfunctional mixer controls " David Henningsson
2012-08-20  9:22 ` [PATCH 0/2] Two fixes " Takashi Iwai
2012-08-20  9:24   ` Takashi Iwai
2012-08-20  9:27   ` David Henningsson
2012-08-20  9:34     ` Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1345454220-4233-2-git-send-email-david.henningsson@canonical.com \
    --to=david.henningsson@canonical.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=ian_minett@creativelabs.com \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).