Re: hda-intel: no soundcard with current linus' git tree

[Maxim Levitsky]

On Thursday 18 October 2007 07:57:27 Takashi Iwai wrote:
> At Thu, 18 Oct 2007 03:53:08 +0200,
> Maxim Levitsky wrote:
> > 
> > From 0824b077b75c19253b45c5a455775c331acd54ee Mon Sep 17 00:00:00 2001
> > From: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
> > 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?

Yes, you are right, but stac925x has only one DAC, and thus if it is connected to any line-out, it will be
'Front', but if it is connected to 'headphones' only, then why not to call it 'Headphone'

STAC  9200 has no volumeknob too, but it is handled seperartly
STAC  9202 and 9250 has no volumeknob too, but as I said they have just one DAC again


Best regards,
	Maxim Levitsky
> 
> 
> Takashi
> 
> > 
> > Signed-off-by: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
> > ---
> >  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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/