diff mbox

Please cherry-pick patch mentioned in LP #414795

Message ID 20100909112710.GA17117@ants.dhis.net
State Accepted
Delegated to: Leann Ogasawara
Headers show

Commit Message

أحمد المحمودي Sept. 9, 2010, 11:27 a.m. UTC 
Hello,

  Daniel T Chen mentioned on LP #414795 [1] that the patch at:

  http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=commitdiff;h=1b0e372d7b52c9fc96348779015a6db7df7f286e

  would fix the wierd beep sound that I have reported since the Karmic 
  cycle. The patch is attached with this email. Please consider applying 
  that patch in Maverick (& maybe Lucid?).

  [1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/414795

Comments

Tim Gardner Sept. 9, 2010, 1:59 p.m. UTC | #1 
On 09/09/2010 04:27 AM, أحمد المحمودي wrote:
> Hello,
>
>    Daniel T Chen mentioned on LP #414795 [1] that the patch at:
>
>    http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=commitdiff;h=1b0e372d7b52c9fc96348779015a6db7df7f286e
>
>    would fix the wierd beep sound that I have reported since the Karmic
>    cycle. The patch is attached with this email. Please consider applying
>    that patch in Maverick (&  maybe Lucid?).
>
>    [1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/414795
>
>

This looks like a good patch for stable updates. However, it needs the 
patch developer's approval that its appropriate given the potential to 
regress other audio platforms,

Please send an email to stable@kernel.org requesting inclusion _after_ 
it has been accepted into Linus' tree.

rtg
Daniel Chen Sept. 9, 2010, 2:08 p.m. UTC | #2 
On Thu, Sep 9, 2010 at 9:59 AM, Tim Gardner <tim.gardner@canonical.com> wrote:
> This looks like a good patch for stable updates. However, it needs the
> patch developer's approval that its appropriate given the potential to
> regress other audio platforms,

You're right, we should get Daniel's input on this patch.

> Please send an email to stable@kernel.org requesting inclusion _after_
> it has been accepted into Linus' tree.

To note, this changeset is 1b0e372d7b52c9fc96348779015a6db7df7f286e in
Linus's tree (linux-2.6.git).
Leann Ogasawara Sept. 10, 2010, 3:40 a.m. UTC | #3 
On Thu, 2010-09-09 at 13:27 +0200, أحمد المحمودي wrote:
> Hello,
> 
>   Daniel T Chen mentioned on LP #414795 [1] that the patch at:
> 
>   http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=commitdiff;h=1b0e372d7b52c9fc96348779015a6db7df7f286e
> 
>   would fix the wierd beep sound that I have reported since the Karmic 
>   cycle. The patch is attached with this email. Please consider applying 
>   that patch in Maverick (& maybe Lucid?).

I've cherry-picked (1b0e372d) and applied this to Maverick linux master.
Ahmed, as mentioned by others, care to also forward this along to
upstream stable as well?  For information on submitting patches to
upstream stable, refer to:

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/stable_kernel_rules.txt;hb=HEAD

Thanks,
Leann

>   [1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/414795
>
diff mbox

Patch

From 1b0e372d7b52c9fc96348779015a6db7df7f286e Mon Sep 17 00:00:00 2001
From: Daniel J Blueman <daniel.blueman@gmail.com>
Date: Tue, 3 Aug 2010 11:09:13 +0100
Subject: [PATCH] ALSA: hda - Fix beep frequency on IDT 92HD73xx and 92HD71Bxx codecs

Fix HDA beep frequency on IDT 92HD73xx and 92HD71Bxx codecs.
These codecs use the standard beep frequency calculation although the
datasheet says it's linear frequency.

Other IDT/STAC codecs might have the same problem.  They should be
fixed individually later.

Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/hda/patch_sigmatel.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index f1e7bab..b8d730c 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -202,6 +202,7 @@  struct sigmatel_spec {
 	unsigned int spdif_mute: 1;
 	unsigned int check_volume_offset:1;
 	unsigned int auto_mic:1;
+	unsigned int linear_tone_beep:1;
 
 	/* gpio lines */
 	unsigned int eapd_mask;
@@ -3802,7 +3803,7 @@  static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
 			return err;
 		if (codec->beep) {
 			/* IDT/STAC codecs have linear beep tone parameter */
-			codec->beep->linear_tone = 1;
+			codec->beep->linear_tone = spec->linear_tone_beep;
 			/* if no beep switch is available, make its own one */
 			caps = query_amp_caps(codec, nid, HDA_OUTPUT);
 			if (!(caps & AC_AMPCAP_MUTE)) {
@@ -5005,6 +5006,7 @@  static int patch_stac9200(struct hda_codec *codec)
 
 	codec->no_trigger_sense = 1;
 	codec->spec = spec;
+	spec->linear_tone_beep = 1;
 	spec->num_pins = ARRAY_SIZE(stac9200_pin_nids);
 	spec->pin_nids = stac9200_pin_nids;
 	spec->board_config = snd_hda_check_board_config(codec, STAC_9200_MODELS,
@@ -5068,6 +5070,7 @@  static int patch_stac925x(struct hda_codec *codec)
 
 	codec->no_trigger_sense = 1;
 	codec->spec = spec;
+	spec->linear_tone_beep = 1;
 	spec->num_pins = ARRAY_SIZE(stac925x_pin_nids);
 	spec->pin_nids = stac925x_pin_nids;
 
@@ -5153,6 +5156,7 @@  static int patch_stac92hd73xx(struct hda_codec *codec)
 
 	codec->no_trigger_sense = 1;
 	codec->spec = spec;
+	spec->linear_tone_beep = 0;
 	codec->slave_dig_outs = stac92hd73xx_slave_dig_outs;
 	spec->num_pins = ARRAY_SIZE(stac92hd73xx_pin_nids);
 	spec->pin_nids = stac92hd73xx_pin_nids;
@@ -5300,6 +5304,7 @@  static int patch_stac92hd83xxx(struct hda_codec *codec)
 
 	codec->no_trigger_sense = 1;
 	codec->spec = spec;
+	spec->linear_tone_beep = 1;
 	codec->slave_dig_outs = stac92hd83xxx_slave_dig_outs;
 	spec->digbeep_nid = 0x21;
 	spec->mux_nids = stac92hd83xxx_mux_nids;
@@ -5522,6 +5527,7 @@  static int patch_stac92hd71bxx(struct hda_codec *codec)
 
 	codec->no_trigger_sense = 1;
 	codec->spec = spec;
+	spec->linear_tone_beep = 0;
 	codec->patch_ops = stac92xx_patch_ops;
 	spec->num_pins = STAC92HD71BXX_NUM_PINS;
 	switch (codec->vendor_id) {
@@ -5779,6 +5785,7 @@  static int patch_stac922x(struct hda_codec *codec)
 
 	codec->no_trigger_sense = 1;
 	codec->spec = spec;
+	spec->linear_tone_beep = 1;
 	spec->num_pins = ARRAY_SIZE(stac922x_pin_nids);
 	spec->pin_nids = stac922x_pin_nids;
 	spec->board_config = snd_hda_check_board_config(codec, STAC_922X_MODELS,
@@ -5883,6 +5890,7 @@  static int patch_stac927x(struct hda_codec *codec)
 
 	codec->no_trigger_sense = 1;
 	codec->spec = spec;
+	spec->linear_tone_beep = 1;
 	codec->slave_dig_outs = stac927x_slave_dig_outs;
 	spec->num_pins = ARRAY_SIZE(stac927x_pin_nids);
 	spec->pin_nids = stac927x_pin_nids;
@@ -6018,6 +6026,7 @@  static int patch_stac9205(struct hda_codec *codec)
 
 	codec->no_trigger_sense = 1;
 	codec->spec = spec;
+	spec->linear_tone_beep = 1;
 	spec->num_pins = ARRAY_SIZE(stac9205_pin_nids);
 	spec->pin_nids = stac9205_pin_nids;
 	spec->board_config = snd_hda_check_board_config(codec, STAC_9205_MODELS,
@@ -6174,6 +6183,7 @@  static int patch_stac9872(struct hda_codec *codec)
 		return -ENOMEM;
 	codec->no_trigger_sense = 1;
 	codec->spec = spec;
+	spec->linear_tone_beep = 1;
 	spec->num_pins = ARRAY_SIZE(stac9872_pin_nids);
 	spec->pin_nids = stac9872_pin_nids;
 
-- 
1.7.1