From 19b9cd968dc2cd27c666d7df7860a5872b42a4f6 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 7 Apr 2010 09:39:01 +0000
Subject: [PATCH] --- yaml --- r: 189750 b: refs/heads/master c:
 7bd912998ec9cdbb0268138b6b51f28adf7865f4 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/infiniband/core/cm.c    | 2 +-
 trunk/drivers/infiniband/hw/mlx4/mr.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e9e63548a670..e55d9c3d7d76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e340c05c0def3bb68db6751299b7821c2ba0621
+refs/heads/master: 7bd912998ec9cdbb0268138b6b51f28adf7865f4
diff --git a/trunk/drivers/infiniband/core/cm.c b/trunk/drivers/infiniband/core/cm.c
index c9730cb3f695..764787ebe8d8 100644
--- a/trunk/drivers/infiniband/core/cm.c
+++ b/trunk/drivers/infiniband/core/cm.c
@@ -3693,7 +3693,7 @@ static void cm_add_one(struct ib_device *ib_device)
 	cm_dev->device = device_create(&cm_class, &ib_device->dev,
 				       MKDEV(0, 0), NULL,
 				       "%s", ib_device->name);
-	if (IS_ERR(cm_dev->device)) {
+	if (!cm_dev->device) {
 		kfree(cm_dev);
 		return;
 	}
diff --git a/trunk/drivers/infiniband/hw/mlx4/mr.c b/trunk/drivers/infiniband/hw/mlx4/mr.c
index 8f3666b20ea4..63ec26f6b0c6 100644
--- a/trunk/drivers/infiniband/hw/mlx4/mr.c
+++ b/trunk/drivers/infiniband/hw/mlx4/mr.c
@@ -238,7 +238,7 @@ struct ib_fast_reg_page_list *mlx4_ib_alloc_fast_reg_page_list(struct ib_device
 	mfrpl->mapped_page_list = dma_alloc_coherent(&dev->dev->pdev->dev,
 						     size, &mfrpl->map,
 						     GFP_KERNEL);
-	if (!mfrpl->ibfrpl.page_list)
+	if (!mfrpl->mapped_page_list)
 		goto err_free;
 
 	WARN_ON(mfrpl->map & 0x3f);