From: Michael Neuling <mikey@neuling.org>
To: mpe@ellerman.id.au, benh@kernel.crashing.org
Cc: imunsie@au.ibm.com, linuxppc-dev@ozlabs.org, mikey@neuling.org,
Daniel Axtens <dja@axtens.net>,
"Matthew R. Ochs" <mrochs@linux.vnet.ibm.com>,
"Manoj N. Kumar" <manoj@linux.vnet.ibm.com>,
brking@linux.vnet.ibm.com
Subject: [PATCH v3 11/24] cxl: Fix error path on probe
Date: Wed, 27 May 2015 16:07:05 +1000 [thread overview]
Message-ID: <1432706838-20794-12-git-send-email-mikey@neuling.org> (raw)
In-Reply-To: <1432706838-20794-1-git-send-email-mikey@neuling.org>
When probing we call pci_enable_device() but don't call pci_disable_device() on
fail. This causes refcounting issues in the PCI subsystem if a second driver
tries to bind to the same device.
This patch adds the pci_disable_device() to the probe error path. This error
path is hit when this cxl driver tries to bind to AFUs (on the vPHB) rather
than the physical device.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
---
drivers/misc/cxl/pci.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index 3f0caa2..0d429b0 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -1103,6 +1103,7 @@ static int cxl_probe(struct pci_dev *dev, const struct pci_device_id *id)
adapter = cxl_init_adapter(dev);
if (IS_ERR(adapter)) {
dev_err(&dev->dev, "cxl_init_adapter failed: %li\n", PTR_ERR(adapter));
+ pci_disable_device(dev);
return PTR_ERR(adapter);
}
--
2.1.0
next prev parent reply other threads:[~2015-05-27 6:07 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-27 6:06 [PATCH v3 00/24] cxl: Add AFU virtual PHB and in kernel API Michael Neuling
2015-05-27 6:06 ` [PATCH v3 01/24] powerpc/copro: Fix faulting kernel segments Michael Neuling
2015-05-27 6:06 ` [PATCH v3 02/24] powerpc/pci: Export symbols for CXL Michael Neuling
2015-05-27 6:06 ` [PATCH v3 03/24] powerpc/pci: Add release_device() hook to phb ops Michael Neuling
2015-05-27 6:06 ` [PATCH v3 04/24] powerpc: Add cxl context to device archdata Michael Neuling
2015-05-27 6:06 ` [PATCH v3 05/24] powerpc/pci: Add shutdown hook to pci_controller_ops Michael Neuling
2015-05-27 6:07 ` [PATCH v3 06/24] powerpc/pci: Add pcibios_disable_device() hook Michael Neuling
2015-05-27 6:07 ` [PATCH v3 07/24] cxl: Document external user of existing API Michael Neuling
2015-05-27 6:07 ` [PATCH v3 08/24] cxl: Add shutdown hook Michael Neuling
2015-05-27 6:07 ` [PATCH v3 09/24] cxl: Remove unnecessarily verbose print in cxl_remove() Michael Neuling
2015-05-27 6:07 ` [PATCH v3 10/24] cxl: Re-order card init to check the VSEC earlier Michael Neuling
2015-05-27 6:07 ` Michael Neuling [this message]
2015-05-27 6:07 ` [PATCH v3 12/24] cxl: Dump debug info on the AFU configuration record Michael Neuling
2015-05-27 6:07 ` [PATCH v3 13/24] cxl: Add cookie parameter to afu_release_irqs() Michael Neuling
2015-05-27 6:07 ` [PATCH v3 14/24] cxl: Rework detach context functions Michael Neuling
2015-05-27 6:07 ` [PATCH v3 15/24] cxl: cxl_afu_reset() -> __cxl_afu_reset() Michael Neuling
2015-05-27 6:07 ` [PATCH v3 16/24] cxl: Export some symbols Michael Neuling
2015-05-27 6:07 ` [PATCH v3 17/24] cxl: Only check pid for userspace contexts Michael Neuling
2015-05-27 6:07 ` [PATCH v3 18/24] cxl: Split afu_register_irqs() function Michael Neuling
2015-05-27 6:07 ` [PATCH v3 19/24] cxl: Configure PSL for kernel contexts and merge code Michael Neuling
2015-05-27 6:07 ` [PATCH v3 20/24] cxl: Rework context lifetimes Michael Neuling
2015-05-27 6:07 ` [PATCH v3 21/24] cxl: Cleanup Makefile Michael Neuling
2015-05-27 6:07 ` [PATCH v3 22/24] cxl: Move include file cxl.h -> cxl-base.h Michael Neuling
2015-05-27 6:07 ` [PATCH v3 23/24] cxl: Export file ops for use by API Michael Neuling
2015-05-27 6:07 ` [PATCH v3 24/24] cxl: Add AFU virtual PHB and kernel API Michael Neuling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1432706838-20794-12-git-send-email-mikey@neuling.org \
--to=mikey@neuling.org \
--cc=benh@kernel.crashing.org \
--cc=brking@linux.vnet.ibm.com \
--cc=dja@axtens.net \
--cc=imunsie@au.ibm.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=manoj@linux.vnet.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=mrochs@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).