diff options
| author | Roland Dreier <roland@purestorage.com> | 2012-10-23 09:03:49 -0700 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2012-10-23 09:03:49 -0700 |
| commit | 1e3474d1de922ea3df176a0efbef843ada2dd43b (patch) | |
| tree | 2580a2ef5a333d4c6220e0fec5402d91f972e218 /drivers/infiniband/hw/mlx4/alias_GUID.c | |
| parent | 32c631f9f2566d09d32abc2f4c7aa24c6d8b5641 (diff) | |
| parent | 41929ed2656bab8af1734bf5d0088385e72e294f (diff) | |
Merge branches 'cxgb4' and 'mlx4' into for-next
Diffstat (limited to 'drivers/infiniband/hw/mlx4/alias_GUID.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/alias_GUID.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/alias_GUID.c b/drivers/infiniband/hw/mlx4/alias_GUID.c index d2fb38d4357..2f215b93db6 100644 --- a/drivers/infiniband/hw/mlx4/alias_GUID.c +++ b/drivers/infiniband/hw/mlx4/alias_GUID.c @@ -107,7 +107,7 @@ static __be64 get_cached_alias_guid(struct mlx4_ib_dev *dev, int port, int index { if (index >= NUM_ALIAS_GUID_PER_PORT) { pr_err("%s: ERROR: asked for index:%d\n", __func__, index); - return (__force __be64) ((u64) 0xFFFFFFFFFFFFFFFFUL); + return (__force __be64) -1; } return *(__be64 *)&dev->sriov.demux[port - 1].guid_cache[index]; } |