From 8a2e5c6757b803bd63d30d2d45277a21298e09fa Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 9 Nov 2006 21:02:26 +0100
Subject: [PATCH] --- yaml --- r: 40895 b: refs/heads/master c:
 b26c791e9ca3365616d40836000285931ca033d0 h: refs/heads/master i:   40893:
 f6180218abcf885753eced87a9da67f4c54ec043   40891:
 dbd4d8b63735726f07701a2e1002176dea893130   40887:
 478eb4ab47489a920fd150f5f13277f1b0e1deb0   40879:
 3f0ab0d8a4062ed378d61e265c652fe78abc194b   40863:
 b36c223c80cec598ce05cd01f20fdc3b5669973a   40831:
 562e845289e1513f8fae4dc4ce66a679c5af9980 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 ee6b8383dad0..8f6e99ae6de7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ffcab6ae44b02679229ca1852526d0a6e062dd2
+refs/heads/master: b26c791e9ca3365616d40836000285931ca033d0
diff --git a/trunk/drivers/infiniband/hw/amso1100/c2_rnic.c b/trunk/drivers/infiniband/hw/amso1100/c2_rnic.c
index 21d9612a56cc..623dc95f91df 100644
--- a/trunk/drivers/infiniband/hw/amso1100/c2_rnic.c
+++ b/trunk/drivers/infiniband/hw/amso1100/c2_rnic.c
@@ -157,8 +157,8 @@ static int c2_rnic_query(struct c2_dev *c2dev, struct ib_device_attr *props)
 
 	props->fw_ver =
 		((u64)be32_to_cpu(reply->fw_ver_major) << 32) |
-		((be32_to_cpu(reply->fw_ver_minor) && 0xFFFF) << 16) |
-		(be32_to_cpu(reply->fw_ver_patch) && 0xFFFF);
+		((be32_to_cpu(reply->fw_ver_minor) & 0xFFFF) << 16) |
+		(be32_to_cpu(reply->fw_ver_patch) & 0xFFFF);
 	memcpy(&props->sys_image_guid, c2dev->netdev->dev_addr, 6);
 	props->max_mr_size         = 0xFFFFFFFF;
 	props->page_size_cap       = ~(C2_MIN_PAGESIZE-1);