On Mon, 07 Dec 2015 22:24:22 +0100, Subhransu S. Prusty wrote: > > Instead of direct mapping between converter and pin, Muxes are > added between them to support any converter connection to any pin. > > As the possible mux inputs can only be identified during runtime, > all possible routes are created to connect all converters to all > pin muxes. The user should enable appropriate mux inputs to enable > correct port. > > In the process to support the above changes widget/route fill APIs > are updated to take all required parameters. > > Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@xxxxxxxxx> > Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx> > --- > sound/soc/codecs/hdac_hdmi.c | 224 ++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 202 insertions(+), 22 deletions(-) > > diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c > index 01d063e..467143cc 100644 > --- a/sound/soc/codecs/hdac_hdmi.c > +++ b/sound/soc/codecs/hdac_hdmi.c > @@ -463,46 +463,224 @@ static int hdac_hdmi_query_pin_connlist(struct hdac_ext_device *hdac, > return pin->num_mux_nids; > } > > -static void hdac_hdmi_fill_widget_info(struct snd_soc_dapm_widget *w, > - enum snd_soc_dapm_type id, > - const char *wname, const char *stream) > +static void hdac_hdmi_fill_widget_info(struct device *dev, > + struct snd_soc_dapm_widget *w, > + enum snd_soc_dapm_type id, void *priv, > + const char *wname, const char *stream, > + struct snd_kcontrol_new *wc, int numkc) > { > w->id = id; > - w->name = wname; > + w->name = devm_kstrdup(dev, wname, GFP_KERNEL); Missing NULL check. Not only here but in handful places in this patch. Takashi _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel