Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1526097 > unrolled thread

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

Started byQuentin Lambert <lambert.quentin@gmail.com>
First post2016-11-19 18:50 +0100
Last post2016-11-24 00:00 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] PCI Hotplug: cpqphp: Add missing call to pci_disable_device Quentin Lambert <lambert.quentin@gmail.com> - 2016-11-19 18:50 +0100
    Re: [PATCH] PCI Hotplug: cpqphp: Add missing call to  pci_disable_device Bjorn Helgaas <helgaas@kernel.org> - 2016-11-24 00:00 +0100

#1526097 — [PATCH] PCI Hotplug: cpqphp: Add missing call to pci_disable_device

FromQuentin Lambert <lambert.quentin@gmail.com>
Date2016-11-19 18:50 +0100
Subject[PATCH] PCI Hotplug: cpqphp: Add missing call to pci_disable_device
Message-ID<sFhW1-7Z6-25@gated-at.bofh.it>
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 <lambert.quentin@gmail.com>

---
 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

[toc] | [next] | [standalone]


#1528825 — Re: [PATCH] PCI Hotplug: cpqphp: Add missing call to pci_disable_device

FromBjorn Helgaas <helgaas@kernel.org>
Date2016-11-24 00:00 +0100
SubjectRe: [PATCH] PCI Hotplug: cpqphp: Add missing call to pci_disable_device
Message-ID<sGOGd-2vZ-5@gated-at.bofh.it>
In reply to#1526097
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 <lambert.quentin@gmail.com>

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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web