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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx4
/
fw.c
diff --git
a/drivers/net/ethernet/mellanox/mlx4/fw.c
b/drivers/net/ethernet/mellanox/mlx4/fw.c
index fda26679f7d5c8cac8780c55a470357a2f16ec01..194928214606e160932fcb335f604421431b6eb2 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/
drivers/net/ethernet/mellanox/mlx4/fw.c
@@
-1774,7
+1774,7
@@
void mlx4_opreq_action(struct work_struct *work)
MLX4_CMD_GET_OP_REQ, MLX4_CMD_TIME_CLASS_A,
MLX4_CMD_NATIVE);
if (err) {
- mlx4_err(dev, "Failed to retr
ei
ve required operation: %d\n",
+ mlx4_err(dev, "Failed to retr
ie
ve required operation: %d\n",
err);
return;
}