1 files changed, 10 insertions, 15 deletions

diff --git a/drivers/infiniband/hw/qib/qib_diag.c b/drivers/infiniband/hw/qib/qib_diag.c
index 07f9030a8f10..5dfda4c5cc9c 100644
--- a/drivers/infiniband/hw/qib/qib_diag.c
+++ b/drivers/infiniband/hw/qib/qib_diag.c
@@ -694,28 +694,23 @@ int qib_register_observer(struct qib_devdata *dd,
                           const struct diag_observer *op)
 {
         struct diag_observer_list_elt *olp;
-        int ret = -EINVAL;
+        unsigned long flags;
 
         if (!dd || !op)
-                goto bail;
-        ret = -ENOMEM;
+                return -EINVAL;
         olp = vmalloc(sizeof *olp);
         if (!olp) {
                 pr_err("vmalloc for observer failed\n");
-                goto bail;
+                return -ENOMEM;
         }
-        if (olp) {
-                unsigned long flags;
 
-                spin_lock_irqsave(&dd->qib_diag_trans_lock, flags);
-                olp->op = op;
-                olp->next = dd->diag_observer_list;
-                dd->diag_observer_list = olp;
-                spin_unlock_irqrestore(&dd->qib_diag_trans_lock, flags);
-                ret = 0;
-        }
-bail:
-        return ret;
+        spin_lock_irqsave(&dd->qib_diag_trans_lock, flags);
+        olp->op = op;
+        olp->next = dd->diag_observer_list;
+        dd->diag_observer_list = olp;
+        spin_unlock_irqrestore(&dd->qib_diag_trans_lock, flags);
+
+        return 0;
 }
 
 /* Remove all registered observers when device is closed */