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

Commit 2eb1eb02 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PNP / ACPI: Use ACPI_COMPANION_SET() during initialization 



pnpacpi_add_device() calls acpi_bind_one() on an already registered
device, which is a mistake, but it can initialize the ACPI companion
field of the struct device to be registered using ACPI_COMPANION_SET()
instead, so make it do that.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 06e5801b

drivers/pnp/pnpacpi/core.c

+2 −3
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device) 
	if (!dev)

		return -ENOMEM;



	ACPI_COMPANION_SET(&dev->dev, device);

	dev->data = device;

	/* .enabled means the device can decode the resources */

	dev->active = device->status.enabled;
@@ -290,11 +291,9 @@ static int __init pnpacpi_add_device(struct acpi_device *device) 
		return error;

	}



	error = acpi_bind_one(&dev->dev, device);



	num++;



	return error;

	return 0;

}



static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,