At Fri, 11 Feb 2011 16:18:31 -0800,
<gre...@suse.de> wrote:
> 
> 
> This is a note to let you know that I've just added the patch titled
> 
>     ALSA: HDA: Create mixers on ALC887
> 
> to the 2.6.32-longterm tree which can be found at:
>     
> http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.32.git;a=summary
> 
> The filename of the patch is:
>      alsa-hda-create-mixers-on-alc887.patch
> and it can be found in the queue-2.6.32 subdirectory.
> 
> If you, or anyone else, feels it should not be added to the 2.6.32 longterm 
> tree,
> please let <sta...@kernel.org> know about it.

Please drop this.  This was a mistaken merge.


thanks,

Takashi


> 
> 
> >From 03b7a1ab557efe34e8f79b78660e514bd7374248 Mon Sep 17 00:00:00 2001
> From: David Henningsson <david.hennings...@canonical.com>
> Date: Tue, 9 Nov 2010 14:35:30 +0100
> Subject: ALSA: HDA: Create mixers on ALC887
> 
> From: David Henningsson <david.hennings...@canonical.com>
> 
> commit 03b7a1ab557efe34e8f79b78660e514bd7374248 upstream.
> 
> BugLink: http://launchpad.net/bugs/669092
> 
> ALC887 does not have any volume control ability on the mixer NIDs,
> so put the volume controls on the dac NIDs instead. Without this
> patch, ALC887 users cannot use alsamixer at all.
> 
> Signed-off-by: David Henningsson <david.hennings...@canonical.com>
> Signed-off-by: Takashi Iwai <ti...@suse.de>
> Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
> 
> ---
>  sound/pci/hda/patch_realtek.c |   10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -9811,6 +9811,9 @@ static int alc_auto_add_mic_boost(struct
>       return 0;
>  }
>  
> +static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
> +                                          const struct auto_pin_cfg *cfg);
> +
>  /* almost identical with ALC880 parser... */
>  static int alc882_parse_auto_config(struct hda_codec *codec)
>  {
> @@ -9828,7 +9831,10 @@ static int alc882_parse_auto_config(stru
>       err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
>       if (err < 0)
>               return err;
> -     err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
> +     if (codec->vendor_id == 0x10ec0887)
> +             err = alc861vd_auto_create_multi_out_ctls(spec, &spec->autocfg);
> +     else
> +             err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
>       if (err < 0)
>               return err;
>       err = alc880_auto_create_extra_out(spec,
> @@ -15438,7 +15444,7 @@ static void alc861vd_auto_init_analog_in
>  #define alc861vd_idx_to_mixer_switch(nid)    ((nid) + 0x0c)
>  
>  /* add playback controls from the parsed DAC table */
> -/* Based on ALC880 version. But ALC861VD has separate,
> +/* Based on ALC880 version. But ALC861VD and ALC887 have separate,
>   * different NIDs for mute/unmute switch and volume control */
>  static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
>                                            const struct auto_pin_cfg *cfg)
> 
> 
> Patches currently in longterm-queue-2.6.32 which might be from 
> david.hennings...@canonical.com are
> 

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to