From 089c38c6e433f6ef6b12f4af5efa424f8c02fec5 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 15 May 2010 23:18:16 +0200 Subject: [PATCH] --- yaml --- r: 197925 b: refs/heads/master c: 8f6bce3c4f48bd79b57d6ac9f337f5aabee43ea7 h: refs/heads/master i: 197923: 13bace20c8868ccf226edf75aa34377043b7b9c5 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/cpqphp_core.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 05acff5ed047..a5a69dfe56fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b79995700e25dd6b0b0aff7edd0c102d1b6281f7 +refs/heads/master: 8f6bce3c4f48bd79b57d6ac9f337f5aabee43ea7 diff --git a/trunk/drivers/pci/hotplug/cpqphp_core.c b/trunk/drivers/pci/hotplug/cpqphp_core.c index f184d1d2ecbe..cb7818ffd5cf 100644 --- a/trunk/drivers/pci/hotplug/cpqphp_core.c +++ b/trunk/drivers/pci/hotplug/cpqphp_core.c @@ -1075,13 +1075,12 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) /* make our own copy of the pci bus structure, * as we like tweaking it a lot */ - ctrl->pci_bus = kmalloc(sizeof(*ctrl->pci_bus), GFP_KERNEL); + ctrl->pci_bus = kmemdup(pdev->bus, sizeof(*ctrl->pci_bus), GFP_KERNEL); if (!ctrl->pci_bus) { err("out of memory\n"); rc = -ENOMEM; goto err_free_ctrl; } - memcpy(ctrl->pci_bus, pdev->bus, sizeof(*ctrl->pci_bus)); ctrl->bus = pdev->bus->number; ctrl->rev = pdev->revision;