diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-03-15 15:14:37 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-03-20 13:48:15 -0400 |
commit | 6a3b3e26803fc823058fbb05abb5e0d92a52e1bd (patch) | |
tree | f868b0ef9c3d5d69f693fb73346f7f71266db092 /drivers/pci | |
parent | 32a9a682bef2f6fce7026bd94d1ce20028b0e52d (diff) |
PCI: Use kzalloc() in pci_create_bus()
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/probe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 23362e8c696f..9e7d642e66b0 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -1114,7 +1114,7 @@ struct pci_bus * pci_create_bus(struct device *parent, | |||
1114 | if (!b) | 1114 | if (!b) |
1115 | return NULL; | 1115 | return NULL; |
1116 | 1116 | ||
1117 | dev = kmalloc(sizeof(*dev), GFP_KERNEL); | 1117 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
1118 | if (!dev){ | 1118 | if (!dev){ |
1119 | kfree(b); | 1119 | kfree(b); |
1120 | return NULL; | 1120 | return NULL; |
@@ -1133,7 +1133,6 @@ struct pci_bus * pci_create_bus(struct device *parent, | |||
1133 | list_add_tail(&b->node, &pci_root_buses); | 1133 | list_add_tail(&b->node, &pci_root_buses); |
1134 | up_write(&pci_bus_sem); | 1134 | up_write(&pci_bus_sem); |
1135 | 1135 | ||
1136 | memset(dev, 0, sizeof(*dev)); | ||
1137 | dev->parent = parent; | 1136 | dev->parent = parent; |
1138 | dev->release = pci_release_bus_bridge_dev; | 1137 | dev->release = pci_release_bus_bridge_dev; |
1139 | dev_set_name(dev, "pci%04x:%02x", pci_domain_nr(b), bus); | 1138 | dev_set_name(dev, "pci%04x:%02x", pci_domain_nr(b), bus); |