From 5925c1f49099149a3d8ceccd047630aa4f12adf7 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 24 May 2010 12:13:16 -0700 Subject: [PATCH] --- yaml --- r: 199337 b: refs/heads/master c: b46fc5f235be04a7f77fb2af1d8cb809889c25c1 h: refs/heads/master i: 199335: 59608ae13a401a3e6312b3f9c14df7d4b7614b55 v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/acpi.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e1d6224e8f62..be24a8ad434f 100644 --- 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 index 31930fd30ea9..7c0ad634694a 100644 --- 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,