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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
benet
/
be_main.c
diff --git
a/drivers/net/benet/be_main.c
b/drivers/net/benet/be_main.c
index 0b35e4a8bf193fd90fd586278340bcc85281dbf7..88ce68d63bcab95081cdcad2abc1a45004fbe0dd 100644
(file)
--- a/
drivers/net/benet/be_main.c
+++ b/
drivers/net/benet/be_main.c
@@
-2746,7
+2746,7
@@
static int be_ctrl_init(struct be_adapter *adapter)
}
memset(mc_cmd_mem->va, 0, mc_cmd_mem->size);
-
spin_lock
_init(&adapter->mbox_lock);
+
mutex
_init(&adapter->mbox_lock);
spin_lock_init(&adapter->mcc_lock);
spin_lock_init(&adapter->mcc_cq_lock);