Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[mirror_ubuntu-artful-kernel.git] / drivers / infiniband / hw / cxgb4 / device.c

diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index 4e5baf4fe15ec3e1d839ef8d70ea9a20f8f4749d..516b0ae6dc3f6d061cc3c7d8ba412196785a599c 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -828,8 +828,10 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev)
        }
        rdev->status_page = (struct t4_dev_status_page *)
                            __get_free_page(GFP_KERNEL);
-       if (!rdev->status_page)
+       if (!rdev->status_page) {
+               err = -ENOMEM;
                goto destroy_ocqp_pool;
+       }
        rdev->status_page->qp_start = rdev->lldi.vr->qp.start;
        rdev->status_page->qp_size = rdev->lldi.vr->qp.size;
        rdev->status_page->cq_start = rdev->lldi.vr->cq.start;
@@ -841,8 +843,6 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev)
                if (rdev->wr_log) {
                        rdev->wr_log_size = 1 << c4iw_wr_log_size_order;
                        atomic_set(&rdev->wr_log_idx, 0);
-               } else {
-                       pr_err(MOD "error allocating wr_log. Logging disabled\n");
                }
        }
 
@@ -1424,8 +1424,6 @@ static void recover_queues(struct uld_ctx *ctx)
 
        qp_list.qps = kzalloc(count * sizeof *qp_list.qps, GFP_ATOMIC);
        if (!qp_list.qps) {
-               printk(KERN_ERR MOD "%s: Fatal error - DB overflow recovery failed\n",
-                      pci_name(ctx->lldi.pdev));
                spin_unlock_irq(&ctx->dev->lock);
                return;
        }