2016-11-19 17:45:14

by Quentin Lambert

Subject: [PATCH] PCI Hotplug: cpqphp: Add missing call to pci_disable_device

Most error branches following the call to pci_enable_device contain
a call to pci_disable_device. This patch add these calls where they are
missing.

This issue was found with Hector.

Signed-off-by: Quentin Lambert <[email protected]>

---
drivers/pci/hotplug/cpqphp_core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -867,7 +867,8 @@ static int cpqhpc_probe(struct pci_dev *
*/
if ((pdev->revision <= 2) && (vendor_id != PCI_VENDOR_ID_INTEL)) {
err(msg_HPC_not_supported);
- return -ENODEV;
+ rc = -ENODEV;
+ goto err_disable_device;
}

/* TODO: This code can be made to support non-Compaq or Intel

2016-11-23 22:58:57

by Bjorn Helgaas

Subject: Re: [PATCH] PCI Hotplug: cpqphp: Add missing call to pci_disable_device

On Sat, Nov 19, 2016 at 06:41:48PM +0100, Quentin Lambert wrote:
> Most error branches following the call to pci_enable_device contain
> a call to pci_disable_device. This patch add these calls where they are
> missing.
>
> This issue was found with Hector.
>
> Signed-off-by: Quentin Lambert <[email protected]>

Applied to pci/hotplug for v4.10, thanks, Quentin!

> ---
> drivers/pci/hotplug/cpqphp_core.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> --- a/drivers/pci/hotplug/cpqphp_core.c
> +++ b/drivers/pci/hotplug/cpqphp_core.c
> @@ -867,7 +867,8 @@ static int cpqhpc_probe(struct pci_dev *
> */
> if ((pdev->revision <= 2) && (vendor_id != PCI_VENDOR_ID_INTEL)) {
> err(msg_HPC_not_supported);
> - return -ENODEV;
> + rc = -ENODEV;
> + goto err_disable_device;
> }
>
> /* TODO: This code can be made to support non-Compaq or Intel
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html