linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] cxl: Fix error handling
@ 2016-10-30 21:40 Christophe JAILLET
  2016-10-31  5:37 ` Michael Ellerman
                   ` (4 more replies)
  0 siblings, 5 replies; 11+ messages in thread
From: Christophe JAILLET @ 2016-10-30 21:40 UTC (permalink / raw)
  To: imunsie, fbarrat
  Cc: linuxppc-dev, linux-kernel, kernel-janitors, Christophe JAILLET

'cxl_dev_context_init()' returns an error pointer in case of error, not
NULL. So test it with IS_ERR.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
un-compiled because I don't have the required  cross build environment.
---
 drivers/misc/cxl/pci.c | 2 +-
 drivers/misc/cxl/phb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index e96be9ca4e60..80a87ab25b83 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -1921,7 +1921,7 @@ static pci_ers_result_t cxl_pci_slot_reset(struct pci_dev *pdev)
 				goto err;
 
 			ctx = cxl_dev_context_init(afu_dev);
-			if (!ctx)
+			if (IS_ERR(ctx))
 				goto err;
 
 			afu_dev->dev.archdata.cxl_ctx = ctx;
diff --git a/drivers/misc/cxl/phb.c b/drivers/misc/cxl/phb.c
index 0935d44c1770..6ec69ada19f4 100644
--- a/drivers/misc/cxl/phb.c
+++ b/drivers/misc/cxl/phb.c
@@ -20,7 +20,7 @@ bool _cxl_pci_associate_default_context(struct pci_dev *dev, struct cxl_afu *afu
 	 * in the virtual phb, we'll need a default context to attach them to.
 	 */
 	ctx = cxl_dev_context_init(dev);
-	if (!ctx)
+	if (IS_ERR(ctx))
 		return false;
 	dev->dev.archdata.cxl_ctx = ctx;
 
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [PATCH] cxl: Fix error handling
@ 2016-10-30 21:34 Christophe JAILLET
  2016-11-22  0:34 ` Michael Ellerman
  0 siblings, 1 reply; 11+ messages in thread
From: Christophe JAILLET @ 2016-10-30 21:34 UTC (permalink / raw)
  To: imunsie, fbarrat
  Cc: linuxppc-dev, linux-kernel, kernel-janitors, Christophe JAILLET

'cxl_dev_context_init()' returns an error pointer in case of error, not
NULL. So test it with IS_ERR.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
un-compiled because I don't have the required  cross build environment.
---
 drivers/misc/cxl/api.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/misc/cxl/api.c b/drivers/misc/cxl/api.c
index 2b88ad8a2a89..e2efc6489c6e 100644
--- a/drivers/misc/cxl/api.c
+++ b/drivers/misc/cxl/api.c
@@ -538,7 +538,7 @@ int _cxl_cx4_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 
 		if (remaining > 0) {
 			new_ctx = cxl_dev_context_init(pdev);
-			if (!new_ctx) {
+			if (IS_ERR(new_ctx)) {
 				pr_warn("%s: Failed to allocate enough contexts for MSIs\n", pci_name(pdev));
 				return -ENOSPC;
 			}
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-11-22  0:34 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-30 21:40 [PATCH] cxl: Fix error handling Christophe JAILLET
2016-10-31  5:37 ` Michael Ellerman
2016-11-01 23:36   ` Jim Davis
2016-11-02 11:12     ` Michael Ellerman
2016-11-02 19:01       ` Jim Davis
2016-11-03  9:55         ` Michael Ellerman
2016-10-31  6:27 ` Andrew Donnellan
2016-11-02 16:50 ` Frederic Barrat
2016-11-16  1:56 ` Ian Munsie
2016-11-22  0:34 ` Michael Ellerman
  -- strict thread matches above, loose matches on Subject: below --
2016-10-30 21:34 [PATCH] " Christophe JAILLET
2016-11-22  0:34 ` Michael Ellerman

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