From: Rafael J. Wysocki Date: Tue, 6 Aug 2013 23:19:37 +0000 (+0200) Subject: ACPI: Create symlinks in acpi_bind_one() under physical_node_lock X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4005520648c7d6cf28e74addb52bc4a793eea3eb;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git ACPI: Create symlinks in acpi_bind_one() under physical_node_lock Put the creation of symlinks in acpi_bind_one() under the physical_node_lock mutex of the given ACPI device object, because that is part of the binding operation logically (those links are already removed under that mutex too). Signed-off-by: Rafael J. Wysocki Acked-by: Toshi Kani Acked-by: Yasuaki Ishimatsu --- diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 92cacb12ef5c..914a34601231 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -242,8 +242,6 @@ int acpi_bind_one(struct device *dev, acpi_handle handle) list_add(&physical_node->node, physnode_list); acpi_dev->physical_node_count++; - mutex_unlock(&acpi_dev->physical_node_lock); - if (!ACPI_HANDLE(dev)) ACPI_HANDLE_SET(dev, acpi_dev->handle); @@ -253,6 +251,8 @@ int acpi_bind_one(struct device *dev, acpi_handle handle) retval = sysfs_create_link(&dev->kobj, &acpi_dev->dev.kobj, "firmware_node"); + mutex_unlock(&acpi_dev->physical_node_lock); + if (acpi_dev->wakeup.flags.valid) device_set_wakeup_capable(dev, true);