From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Sat, 21 Jan 2017 17:56:40 +0100

* Return directly after a call of the function "clp_alloc_block"
  failed here.

* Delete the jump label "out" which became unnecessary with
  this refactoring.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 arch/s390/pci/pci_clp.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index 4f5a1bf3b14b..28e13fa7a79c 100644
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -517,10 +517,9 @@ static int clp_normal_command(struct clp_req *req)
        if (req->lps != 0 && req->lps != 2)
                return -EINVAL;
 
-       rc = -ENOMEM;
        lpcb = clp_alloc_block(GFP_KERNEL);
        if (!lpcb)
-               goto out;
+               return -ENOMEM;
 
        rc = -EFAULT;
        uptr = (void __force __user *)(unsigned long) req->data_p;
@@ -550,7 +549,6 @@ static int clp_normal_command(struct clp_req *req)
 
 out_free:
        clp_free_block(lpcb);
-out:
        return rc;
 }
 
-- 
2.11.0

Reply via email to