RE: linux-next: build failure after merge of the sound-asoc tree

From: Bard Liao
Date: Wed Mar 11 2015 - 22:51:00 EST


> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@xxxxxxxxxxxxxxxx]
> Sent: Thursday, March 12, 2015 10:12 AM
> To: Mark Brown; Liam Girdwood
> Cc: linux-next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; Bard Liao
> Subject: Re: linux-next: build failure after merge of the sound-asoc tree
>
> Hi all,
>
> On Tue, 10 Mar 2015 13:01:20 +1100 Stephen Rothwell
> <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > After merging the sound-asoc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > sound/soc/codecs/rt5670.c: In function 'is_sys_clk_from_pll':
> > sound/soc/codecs/rt5670.c:519:38: error: 'struct snd_soc_dapm_widget'
> has no member named 'codec'
> > struct snd_soc_codec *codec = source->codec;
> > ^
> >

Hi

Please apply Lars-Peter's "ASoC: rt5670: Replace w->codec
snd_soc_dapm_to_codec(w->dapm)" patch
http://mailman.alsa-project.org/pipermail/alsa-devel/2015-January/086618.html

Thanks.

> > Caused by commit 485372dc24ca ("ASoC: rt5670: Check sysclk source by
> > private data")?
>
> Still getting this.
>
> > sound/soc/codecs/rt5670.c: In function 'rt5670_set_dai_sysclk':
> > sound/soc/codecs/rt5670.c:2272:1: error: expected expression before
> > '<<' token <<<<<<< HEAD ^
> > sound/soc/codecs/rt5670.c:2284:1: error: expected expression before
> > '>>' token >>>>>>> v4.0-rc3 ^
> >
> > Oops :-(
>
> This has been fixed.
>
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> ------Please consider the environment before printing this e-mail.
--
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/