Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324276
b: refs/heads/master
c: 4cd8daf
h: refs/heads/master
v: v3
  • Loading branch information
Yinghai Lu authored and Bjorn Helgaas committed Sep 21, 2012
1 parent 293e96e commit 6677d8e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 817a268516f3aaf9e54c5a0f880de37d03ef4c79
refs/heads/master: 4cd8daf05c7071ac80008c8d4368860110fa6466
3 changes: 1 addition & 2 deletions trunk/arch/x86/pci/acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ setup_resource(struct acpi_resource *acpi_res, void *data)
res->flags = flags;
res->start = start;
res->end = end;
res->child = NULL;

if (!pci_use_crs) {
dev_printk(KERN_DEBUG, &info->bridge->dev,
Expand Down Expand Up @@ -434,7 +433,7 @@ probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device,

size = sizeof(*info->res) * info->res_num;
info->res_num = 0;
info->res = kmalloc(size, GFP_KERNEL);
info->res = kzalloc(size, GFP_KERNEL);
if (!info->res)
return;

Expand Down

0 comments on commit 6677d8e

Please sign in to comment.