projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 3.11-rc4 into tty-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx5
/
core
/
uar.c
diff --git
a/drivers/net/ethernet/mellanox/mlx5/core/uar.c
b/drivers/net/ethernet/mellanox/mlx5/core/uar.c
index 71d4a39372009847b7d03b11c58e8ccf695e61b3..68f5d9c77c7b13b9038cf5bc4e920e09ac3c33a9 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx5/core/uar.c
+++ b/
drivers/net/ethernet/mellanox/mlx5/core/uar.c
@@
-164,6
+164,7
@@
int mlx5_alloc_uuars(struct mlx5_core_dev *dev, struct mlx5_uuar_info *uuari)
uuari->uars[i].map = ioremap(addr, PAGE_SIZE);
if (!uuari->uars[i].map) {
mlx5_cmd_free_uar(dev, uuari->uars[i].index);
+ err = -ENOMEM;
goto out_count;
}
mlx5_core_dbg(dev, "allocated uar index 0x%x, mmaped at %p\n",