diff options
| author | Jean Delvare <khali@linux-fr.org> | 2006-11-09 21:02:26 +0100 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2006-11-13 09:38:07 -0800 |
| commit | b26c791e9ca3365616d40836000285931ca033d0 (patch) | |
| tree | b1ba0abcd231c54878d2cbf58a6baa057abfedec /drivers | |
| parent | 2ffcab6ae44b02679229ca1852526d0a6e062dd2 (diff) | |
| download | linux-stable-b26c791e9ca3365616d40836000285931ca033d0.tar.gz linux-stable-b26c791e9ca3365616d40836000285931ca033d0.tar.bz2 linux-stable-b26c791e9ca3365616d40836000285931ca033d0.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/hw/amso1100/c2_rnic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2_rnic.c b/drivers/infiniband/hw/amso1100/c2_rnic.c index 21d9612a56cc..623dc95f91df 100644 --- a/drivers/infiniband/hw/amso1100/c2_rnic.c +++ b/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); |