Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
RDMA/amso1100: Fix && typo
Fix the AMSO1100 firmware version computation, which was broken
due to "&&" being used where "&" should have.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
authored by Jean Delvare and committed by Roland Dreier b26c791e 2ffcab6a
+2
-2
drivers/infiniband/hw/amso1100/c2_rnic.c
+2
-2
drivers/infiniband/hw/amso1100/c2_rnic.c
···
157
158
props->fw_ver =
159
((u64)be32_to_cpu(reply->fw_ver_major) << 32) |
160
-
((be32_to_cpu(reply->fw_ver_minor) && 0xFFFF) << 16) |
161
-
(be32_to_cpu(reply->fw_ver_patch) && 0xFFFF);
162
memcpy(&props->sys_image_guid, c2dev->netdev->dev_addr, 6);
163
props->max_mr_size = 0xFFFFFFFF;
164
props->page_size_cap = ~(C2_MIN_PAGESIZE-1);
···
157
158
props->fw_ver =
159
((u64)be32_to_cpu(reply->fw_ver_major) << 32) |
160
+
((be32_to_cpu(reply->fw_ver_minor) & 0xFFFF) << 16) |
161
+
(be32_to_cpu(reply->fw_ver_patch) & 0xFFFF);
162
memcpy(&props->sys_image_guid, c2dev->netdev->dev_addr, 6);
163
props->max_mr_size = 0xFFFFFFFF;
164
props->page_size_cap = ~(C2_MIN_PAGESIZE-1);