Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759466AbXJRGoD (ORCPT ); Thu, 18 Oct 2007 02:44:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754864AbXJRGnx (ORCPT ); Thu, 18 Oct 2007 02:43:53 -0400 Received: from mx2.suse.de ([195.135.220.15]:38716 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752563AbXJRGnx (ORCPT ); Thu, 18 Oct 2007 02:43:53 -0400 Date: Thu, 18 Oct 2007 07:57:27 +0200 Message-ID: From: Takashi Iwai To: Maxim Levitsky Cc: Thomas Meyer , Linux Kernel Mailing List , alsa-devel@alsa-project.org Subject: Re: hda-intel: no soundcard with current linus' git tree In-Reply-To: <200710180353.08638.maximlevitsky@gmail.com> References: <471538C2.80806@m3y3r.de> <471651C4.20907@m3y3r.de> <200710180351.50618.maximlevitsky@gmail.com> <200710180353.08638.maximlevitsky@gmail.com> User-Agent: Wanderlust/2.15.5 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta28) (fuki) (+CVS-20070806) (i386-suse-linux) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1528 Lines: 47 At Thu, 18 Oct 2007 03:53:08 +0200, Maxim Levitsky wrote: > > From 0824b077b75c19253b45c5a455775c331acd54ee Mon Sep 17 00:00:00 2001 > From: Maxim Levitsky > Date: Thu, 18 Oct 2007 03:35:37 +0200 > Subject: [PATCH] [HDA] [STAC] Since there is now a master volume control, > don't call the headphone output "Master", it isn't strictly correct anyway I thought stac925x has no volume knob, so "Master" should be still applied for this codec? Takashi > > Signed-off-by: Maxim Levitsky > --- > pci/hda/patch_sigmatel.c | 7 +------ > 1 files changed, 1 insertions(+), 6 deletions(-) > > diff --git a/pci/hda/patch_sigmatel.c b/pci/hda/patch_sigmatel.c > index 6dffa54..7f157a6 100644 > --- a/pci/hda/patch_sigmatel.c > +++ b/pci/hda/patch_sigmatel.c > @@ -1907,12 +1907,7 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec, > return err; > } > if (spec->multiout.hp_nid) { > - const char *pfx; > - if (old_num_dacs == spec->multiout.num_dacs) > - pfx = "Master"; > - else > - pfx = "Headphone"; > - err = create_controls(spec, pfx, spec->multiout.hp_nid, 3); > + err = create_controls(spec, "Headphone", spec->multiout.hp_nid, 3); > if (err < 0) > return err; > } > -- > 1.5.3.4 > - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/