diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
| commit | 90890687859ea658759e653c4e70ed7e9e1a6217 (patch) | |
| tree | 9065b30bb189e16ef99b8b5a0d444558f8dc579f /drivers/pci/pci-sysfs.c | |
| parent | 2995bfb7855aabd493f840af361f3dd7d221caea (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/pci/pci-sysfs.c')
| -rw-r--r-- | drivers/pci/pci-sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 56a3b397efee..2898830c496f 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
| @@ -360,7 +360,7 @@ pci_create_resource_files(struct pci_dev *pdev) | |||
| 360 | continue; | 360 | continue; |
| 361 | 361 | ||
| 362 | /* allocate attribute structure, piggyback attribute name */ | 362 | /* allocate attribute structure, piggyback attribute name */ |
| 363 | res_attr = kcalloc(1, sizeof(*res_attr) + 10, GFP_ATOMIC); | 363 | res_attr = kzalloc(sizeof(*res_attr) + 10, GFP_ATOMIC); |
| 364 | if (res_attr) { | 364 | if (res_attr) { |
| 365 | char *res_attr_name = (char *)(res_attr + 1); | 365 | char *res_attr_name = (char *)(res_attr + 1); |
| 366 | 366 | ||