git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
pci
/
acpi.c
diff --git
a/arch/x86/pci/acpi.c
b/arch/x86/pci/acpi.c
index 31930fd30ea95a36232c2ed7df0a6a1f97147b1f..2ec04c424a6229f7d830e78fb49f5532b804d212 100644
(file)
--- 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;
if (!info.res)
goto res_alloc_fail;
- info.name = k
malloc(16, GFP_KERNEL
);
+ info.name = k
asprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum
);
if (!info.name)
goto name_alloc_fail;
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,
info.res_num = 0;
acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
@@
-224,8
+223,11
@@
res_alloc_fail:
return;
}
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;
struct pci_bus *bus;
struct pci_sysdata *sd;
int node;