At Wed, 14 Sep 2011 13:42:52 +0200, David Henningsson wrote:
[1 <text/plain; ISO-8859-1 (7bit)>] On 09/14/2011 01:35 PM, Takashi Iwai wrote:
At Wed, 14 Sep 2011 13:25:55 +0200, David Henningsson wrote:
From 7d63b3c06a02d107d9f499c43d6396ada9caae98 Mon Sep 17 00:00:00 2001
From: David Henningssondavid.henningsson@canonical.com Date: Wed, 14 Sep 2011 13:22:54 +0200 Subject: [PATCH] ALSA: HDA: Cirrus - fix "Surround Speaker" volume control name
Commit b4dabfc452a10 fixed only the "Switch" name, not the "Volume" name.
Signed-off-by: David Henningssondavid.henningsson@canonical.com
sound/pci/hda/patch_cirrus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index d6c93d9..c45f3e6 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -535,7 +535,7 @@ static int add_volume(struct hda_codec *codec, const char *name, int index, unsigned int pval, int dir, struct snd_kcontrol **kctlp) {
- char tmp[32];
- char tmp[44]; struct snd_kcontrol_new knew = HDA_CODEC_VOLUME_IDX(tmp, index, 0, 0, HDA_OUTPUT); knew.private_value = pval;
Hm, it doesn't match with the patch description...
Better commit message now?
Yep, more understandable. Applied now (with Cc to stable).
thanks,
Takashi
-- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic [2 0001-ALSA-HDA-Cirrus-fix-Surround-Speaker-volume-control-.patch <text/x-patch (7bit)>]
From cd0944c76e1d43e15aa5147546ede32813e85901 Mon Sep 17 00:00:00 2001
From: David Henningsson david.henningsson@canonical.com Date: Wed, 14 Sep 2011 13:22:54 +0200 Subject: [PATCH] ALSA: HDA: Cirrus - fix "Surround Speaker" volume control name
This patch fixes "Surround Speaker Playback Volume" being cut off. (Commit b4dabfc452a10 was probably meant to fix this, but it fixed only the "Switch" name, not the "Volume" name.)
Signed-off-by: David Henningsson david.henningsson@canonical.com
sound/pci/hda/patch_cirrus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index d6c93d9..c45f3e6 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -535,7 +535,7 @@ static int add_volume(struct hda_codec *codec, const char *name, int index, unsigned int pval, int dir, struct snd_kcontrol **kctlp) {
- char tmp[32];
- char tmp[44]; struct snd_kcontrol_new knew = HDA_CODEC_VOLUME_IDX(tmp, index, 0, 0, HDA_OUTPUT); knew.private_value = pval;
-- 1.7.5.4