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@xxxxxxxxxx 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;
Attachment:
signature.asc
Description: PGP signature
