linux-kernel - Re: [PATCH V2 3/4] ASoC: codecs: Add code for bin parsing compatible with aw88399

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <06c14b04-28df-4374-80e3-91e40bc53a84@sirena.org.uk>
Date:   Tue, 24 Oct 2023 14:57:03 +0100
From:   Mark Brown <broonie@...nel.org>
To:     wangweidong.a@...nic.com
Cc:     13916275206@....com, ajye_huang@...pal.corp-partner.google.com,
        alsa-devel@...a-project.org, arnd@...db.de,
        ckeepax@...nsource.cirrus.com, colin.i.king@...il.com,
        conor+dt@...nel.org, dan.carpenter@...aro.org,
        devicetree@...r.kernel.org, harshit.m.mogalapalli@...cle.com,
        herve.codina@...tlin.com, krzysztof.kozlowski+dt@...aro.org,
        lgirdwood@...il.com, linus.walleij@...aro.org,
        linux-kernel@...r.kernel.org, liweilei@...nic.com, perex@...ex.cz,
        rf@...nsource.cirrus.com, robh+dt@...nel.org, ryans.lee@...log.com,
        sebastian.reichel@...labora.com, shumingf@...ltek.com,
        tiwai@...e.com, trix@...hat.com, yijiangtao@...nic.com
Subject: Re: [PATCH V2 3/4] ASoC: codecs: Add code for bin parsing compatible
 with aw88399

On Tue, Oct 24, 2023 at 01:42:13PM +0100, Mark Brown wrote:
> On Tue, Oct 24, 2023 at 03:19:28PM +0800, wangweidong.a@...nic.com wrote:
> 
> > I generated the patch based on the mainline branch, 
> > Why would there be a conflict? I know that I made a change to
> > this file when I committed aw87390 and that 
> > the change was in the Linux-next branch, but the two 
> > changes are in different parts of the file.
> 
> I don't know off hand, I didn't check in detail.  It's possible someone
> else sent a fix that's been applied and is causing the issue - if you
> check out my branch and try to apply the patches hopefully you can
> figure out what the problem was.

diff --cc sound/soc/codecs/aw88395/aw88395_lib.c
index a0a429ca9768,bc72a7487048..000000000000
--- a/sound/soc/codecs/aw88395/aw88395_lib.c
+++ b/sound/soc/codecs/aw88395/aw88395_lib.c
@@@ -705,7 -703,8 +705,12 @@@ static int aw_dev_load_cfg_by_hdr(struc
  
  	switch (aw_dev->chip_id) {
  	case AW88395_CHIP_ID:
++<<<<<<< HEAD
 +		ret = aw88395_dev_cfg_get_valid_prof(aw_dev, all_prof_info);
++=======
+ 	case AW88399_CHIP_ID:
+ 		ret = aw88395_dev_cfg_get_valid_prof(aw_dev, *all_prof_info);
++>>>>>>> ASoC: codecs: Add code for bin parsing compatible with aw88399
  		if (ret < 0)
  			goto exit;
  		break;

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)