linux-next: manual merge of the sound-asoc tree with the sound tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in:

  sound/pci/hda/cs35l41_hda.c

between commit:

  447106e92a0c ("ALSA: hda: cs35l41: Support mute notifications for CS35L41 HDA")

from the sound tree and commit:

  77bf613f0bf0 ("ASoC: cs35l41: Fix broken shared boost activation")

from the sound-asoc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc sound/pci/hda/cs35l41_hda.c
index 92b815ce193b,c74faa2ff46c..000000000000
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@@ -555,9 -527,15 +555,9 @@@ static void cs35l41_hda_play_done(struc
  
  	dev_dbg(dev, "Play (Complete)\n");
  
- 	cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 1, NULL,
+ 	cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 1,
  			      cs35l41->firmware_running);
 -	if (cs35l41->firmware_running) {
 -		regmap_multi_reg_write(reg, cs35l41_hda_unmute_dsp,
 -				       ARRAY_SIZE(cs35l41_hda_unmute_dsp));
 -	} else {
 -		regmap_multi_reg_write(reg, cs35l41_hda_unmute,
 -				       ARRAY_SIZE(cs35l41_hda_unmute));
 -	}
 +	cs35l41_mute(dev, false);
  }
  
  static void cs35l41_hda_pause_start(struct device *dev)
@@@ -567,8 -545,8 +567,8 @@@
  
  	dev_dbg(dev, "Pause (Start)\n");
  
 -	regmap_multi_reg_write(reg, cs35l41_hda_mute, ARRAY_SIZE(cs35l41_hda_mute));
 +	cs35l41_mute(dev, true);
- 	cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 0, NULL,
+ 	cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 0,
  			      cs35l41->firmware_running);
  }

Attachment: pgpyUGO2b4vyA.pgp
Description: OpenPGP digital signature