2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c
index 64aeefbd2a5d..077879c0bdb5 100644
--- a/drivers/infiniband/hw/ipath/ipath_init_chip.c
+++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c
@@ -455,7 +455,7 @@ static void init_shadow_tids(struct ipath_devdata *dd)
         if (!addrs) {
                 ipath_dev_err(dd, "failed to allocate shadow dma handle "
                               "array, no expected sends!\n");
-                vfree(dd->ipath_pageshadow);
+                vfree(pages);
                 dd->ipath_pageshadow = NULL;
                 return;
         }
diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c
index 0190edc8044e..855911e7396d 100644
--- a/drivers/infiniband/hw/ipath/ipath_user_pages.c
+++ b/drivers/infiniband/hw/ipath/ipath_user_pages.c
@@ -209,20 +209,20 @@ void ipath_release_user_pages_on_close(struct page **p, size_t num_pages)
 
         mm = get_task_mm(current);
         if (!mm)
-                goto bail;
+                return;
 
         work = kmalloc(sizeof(*work), GFP_KERNEL);
         if (!work)
                 goto bail_mm;
 
-        goto bail;
-
         INIT_WORK(&work->work, user_pages_account);
         work->mm = mm;
         work->num_pages = num_pages;
 
+        schedule_work(&work->work);
+        return;
+
 bail_mm:
         mmput(mm);
-bail:
         return;
 }