git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ 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...
[safe/jmp/linux-2.6]
/
arch
/
x86
/
pci
/
acpi.c
diff --git
a/arch/x86/pci/acpi.c
b/arch/x86/pci/acpi.c
index
9dcf43d
..
2ec04c4
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,