1 files changed, 5 insertions, 3 deletions

diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 31930fd30ea9..2ec04c424a62 100644
--- a/arch/x86/pci/acpi.c
+++ b/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,
@@ -224,8 +223,11 @@ res_alloc_fail:
         return;
 }
 
-struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
+struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
 {
+        struct acpi_device *device = root->device;
+        int domain = root->segment;
+        int busnum = root->secondary.start;
         struct pci_bus *bus;
         struct pci_sysdata *sd;
         int node;