cxl: Fix memory allocation failure test
authorChristophe Jaillet <christophe.jaillet@wanadoo.fr>
Sun, 30 Oct 2016 19:35:57 +0000 (20:35 +0100)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 18 Nov 2016 11:41:08 +0000 (22:41 +1100)
'cxl_context_alloc()' does not return an error pointer. It is just a
shortcut for a call to 'kzalloc' with 'sizeof(struct cxl_context)' as the
size parameter.

So its return value should be compared with NULL.
While fixing it, simplify a bit the code.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Acked-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
drivers/misc/cxl/api.c

index 2e5233b6097110e72ae147f21ed15cf259b0a5a9..2b88ad8a2a89ecb676e78b28c64c6802bd5354a9 100644 (file)
@@ -30,10 +30,8 @@ struct cxl_context *cxl_dev_context_init(struct pci_dev *dev)
                return ERR_CAST(afu);
 
        ctx = cxl_context_alloc();
-       if (IS_ERR(ctx)) {
-               rc = PTR_ERR(ctx);
-               goto err_dev;
-       }
+       if (!ctx)
+               return ERR_PTR(-ENOMEM);
 
        ctx->kernelapi = true;
 
@@ -61,7 +59,6 @@ err_mapping:
        kfree(mapping);
 err_ctx:
        kfree(ctx);
-err_dev:
        return ERR_PTR(rc);
 }
 EXPORT_SYMBOL_GPL(cxl_dev_context_init);