---

yaml --- r: 336675 b: refs/heads/master c: ccf7804 h: refs/heads/master i: 336673: b8abd0e 336671: 68dc67e v: v3
git-mirror · Nov 14, 2012 · 9d065c1 · 9d065c1
1 parent 02f2bb1
commit 9d065c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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);