Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f092803 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-3.16-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "One commit that fixes a problem causing PNP devices to be associated
  with wrong ACPI device objects sometimes during device enumeration due
  to an incorrect check in a matching function.

  That problem was uncovered by the ACPI device enumeration rework in
  3.14"

* tag 'pm+acpi-3.16-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / PNP: Fix acpi_pnp_match()
parents 7c909b09 b6328a07

drivers/pnp/pnpacpi/core.c

+1 −2
Original line number Diff line number Diff line
@@ -319,8 +319,7 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp) 
	struct pnp_dev *pnp = _pnp;



	/* true means it matched */

	return !acpi->physical_node_count

	    && compare_pnp_id(pnp->id, acpi_device_hid(acpi));

	return pnp->data == acpi;

}



static struct acpi_device * __init acpi_pnp_find_companion(struct device *dev)