From 8ac19762e17792fe38d998db4676341beb59db76 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 10 Oct 2006 14:26:02 -0700
Subject: [PATCH] --- yaml --- r: 39791 b: refs/heads/master c:
 fb7711e71ea7cd0d3e77e969df59162388c8a1f9 h: refs/heads/master i:   39789:
 5236216ad142759c4db08a7e53fe8b7fd5c014c2   39787:
 cbf3e7e5bddebe2889f95b7eb376f246fcb7f9b1   39783:
 111b5d4763f458427618a70521e884f2508ae0e0   39775:
 30c1c65e6e02a83c167e3d32119f4ef2fd4981d5 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/infiniband/hw/amso1100/c2_rnic.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3a518437d249..5287c878cd46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d986a27413aad10574f7211524de6a529870d134
+refs/heads/master: fb7711e71ea7cd0d3e77e969df59162388c8a1f9
diff --git a/trunk/drivers/infiniband/hw/amso1100/c2_rnic.c b/trunk/drivers/infiniband/hw/amso1100/c2_rnic.c
index e37c5688c214..30409e179606 100644
--- a/trunk/drivers/infiniband/hw/amso1100/c2_rnic.c
+++ b/trunk/drivers/infiniband/hw/amso1100/c2_rnic.c
@@ -150,8 +150,8 @@ static int c2_rnic_query(struct c2_dev *c2dev, struct ib_device_attr *props)
 	    (struct c2wr_rnic_query_rep *) (unsigned long) (vq_req->reply_msg);
 	if (!reply)
 		err = -ENOMEM;
-
-	err = c2_errno(reply);
+	else
+		err = c2_errno(reply);
 	if (err)
 		goto bail2;