---

yaml --- r: 199337 b: refs/heads/master c: b46fc5f h: refs/heads/master i: 199335: 59608ae v: v3
git-mirror · May 24, 2010 · 5925c1f · 5925c1f
1 parent 84639ab
commit 5925c1f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c3ba8d049247dc06b6dcee1711a11b26647aa44
+refs/heads/master: b46fc5f235be04a7f77fb2af1d8cb809889c25c1
diff --git a/trunk/arch/x86/pci/acpi.c b/trunk/arch/x86/pci/acpi.c
@@ -207,10 +207,9 @@ get_current_resources(struct acpi_device *device, int busnum,
 	if (!info.res)
 		goto res_alloc_fail;
 
-	info.name = kmalloc(16, GFP_KERNEL);
+	info.name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum);
 	if (!info.name)
 		goto name_alloc_fail;
-	sprintf(info.name, "PCI Bus %04x:%02x", domain, busnum);
 
 	info.res_num = 0;
 	acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,