From: Rafael J. Wysocki Date: Thu, 14 Jan 2021 18:47:37 +0000 (+0100) Subject: ACPI: scan: Adjust white space in acpi_device_add() X-Git-Tag: v5.12-rc1~173^2~2^2^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e73c5187cf4f40a5e02b6c8e4dd0fcf9686c006;p=thirdparty%2Fkernel%2Flinux.git ACPI: scan: Adjust white space in acpi_device_add() Add empty lines in some places in acpi_device_add() to help readability and drop leading spaces before the labels in there. No functional impact. Signed-off-by: Rafael J. Wysocki Reviewed-by: Hans de Goede --- diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 0fb1811772b56..1510afa7094d7 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -694,10 +694,12 @@ int acpi_device_add(struct acpi_device *device, if (device->wakeup.flags.valid) list_add_tail(&device->wakeup_list, &acpi_wakeup_device_list); + mutex_unlock(&acpi_device_lock); if (device->parent) device->dev.parent = &device->parent->dev; + device->dev.bus = &acpi_bus_type; device->dev.release = release; result = device_add(&device->dev); @@ -713,16 +715,19 @@ int acpi_device_add(struct acpi_device *device, return 0; - err: +err: mutex_lock(&acpi_device_lock); + if (device->parent) list_del(&device->node); + list_del(&device->wakeup_list); - err_unlock: +err_unlock: mutex_unlock(&acpi_device_lock); acpi_detach_data(device->handle, acpi_scan_drop_device); + return result; }