From 9d065c17fcd17c580540a6f26508e0ff5d72ae79 Mon Sep 17 00:00:00 2001 From: Lv Zheng Date: Tue, 30 Oct 2012 14:41:07 +0100 Subject: [PATCH] --- yaml --- r: 336675 b: refs/heads/master c: ccf78040265bfce2aac5766e1ddf4fc3dde36899 h: refs/heads/master i: 336673: b8abd0e2a8a0c8ff961c1f367b158e0aee348b03 336671: 68dc67e4d50983bb9b345d93f7c0ec525c7b7c3a v: v3 --- [refs] | 2 +- trunk/drivers/acpi/scan.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2399ef7a0e9b..4779a689287f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9743fdea9f9473cd2440741342a5ed8e19eb51bd +refs/heads/master: ccf78040265bfce2aac5766e1ddf4fc3dde36899 diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index 19d3d4a1274a..daa88d527e84 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/drivers/acpi/scan.c @@ -381,6 +381,7 @@ static void acpi_device_release(struct device *dev) struct acpi_device *acpi_dev = to_acpi_device(dev); acpi_free_ids(acpi_dev); + kfree(acpi_dev->pnp.unique_id); kfree(acpi_dev); } @@ -1211,6 +1212,9 @@ static void acpi_device_set_id(struct acpi_device *device) device->pnp.bus_address = info->address; device->flags.bus_address = 1; } + if (info->valid & ACPI_VALID_UID) + device->pnp.unique_id = kstrdup(info->unique_id.string, + GFP_KERNEL); kfree(info);