On Wed, 20 Jan 2010 14:15:54 +0100
Jiri Slaby <jslaby@xxxxxxx> wrote:
> Stanse found an ommitted pci_dev_put on one error path in
> cpcihp_generic_init. The path is taken on !dev, but also when
> dev->hdr_type != PCI_HEADER_TYPE_BRIDGE. However it omits to
> pci_dev_put on the latter.
>
> As it is fine to pass NULL to pci_dev_put, put it in there
> uncoditionally.
>
> Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
> Cc: Scott Murray <scott@xxxxxxxxxxxx>
> Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
> Cc: linux-pci@xxxxxxxxxxxxxxx
> ---
> drivers/pci/hotplug/cpcihp_generic.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/pci/hotplug/cpcihp_generic.c
> b/drivers/pci/hotplug/cpcihp_generic.c index 148fb46..fb3f846 100644
> --- a/drivers/pci/hotplug/cpcihp_generic.c
> +++ b/drivers/pci/hotplug/cpcihp_generic.c
> @@ -162,6 +162,7 @@ static int __init cpcihp_generic_init(void)
> dev = pci_get_slot(bus, PCI_DEVFN(bridge_slot, 0));
> if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {
> err("Invalid bridge device %s", bridge);
> + pci_dev_put(dev);
> return -EINVAL;
> }
> bus = dev->subordinate;
Applied to linux-next, thanks.
--
Jesse Barnes, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
