---

yaml --- r: 40895 b: refs/heads/master c: b26c791 h: refs/heads/master i: 40893: f618021 40891: dbd4d8b 40887: 478eb4a 40879: 3f0ab0d 40863: b36c223 40831: 562e845 v: v3
git-mirror · Nov 13, 2006 · 8a2e5c6 · 8a2e5c6
1 parent 16ec763
commit 8a2e5c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);