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

[Mark Brown]

Hi all,

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

  sound/hda/codecs/side-codecs/cs35l41_hda.c

between commit:

  2f47382b3ea31 ("ALSA: hda: cs35l41: Switch to use acpi_bus_get_primary_device()")

from the pm tree and commit:

  8d70e364e866b ("ALSA: hda: cs35l41: Fix ACPI device reference leak on probe failure")

from the sound 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.

diff --cc sound/hda/codecs/side-codecs/cs35l41_hda.c
index 32abb71dd4019,d50c3d8f5303c..0000000000000
--- a/sound/hda/codecs/side-codecs/cs35l41_hda.c
+++ b/sound/hda/codecs/side-codecs/cs35l41_hda.c
@@@ -1926,11 -1925,10 +1925,9 @@@ static int cs35l41_hda_read_acpi(struc
  	}
  
  	cs35l41->dacpi = adev;
 -	struct device *physdev __free(put_device) =
 -		get_device(acpi_get_first_physical_node(adev));
 +	struct device *physdev __free(put_device) = acpi_bus_get_primary_device(adev);
- 	if (!physdev) {
- 		acpi_dev_put(adev);
+ 	if (!physdev)
  		return -ENODEV;
- 	}
  
  	sub = acpi_get_subsystem_id(ACPI_HANDLE(physdev));
  	if (IS_ERR(sub))

Attachment: signature.asc
Description: PGP signature