git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[pandora-kernel.git]
/
drivers
/
net
/
3c527.c
diff --git
a/drivers/net/3c527.c
b/drivers/net/3c527.c
index
0d6ca1e
..
013b7c3
100644
(file)
--- a/
drivers/net/3c527.c
+++ b/
drivers/net/3c527.c
@@
-522,7
+522,7
@@
static int __init mc32_probe1(struct net_device *dev, int slot)
lp->tx_len = lp->exec_box->data[9]; /* Transmit list count */
lp->rx_len = lp->exec_box->data[11]; /* Receive list count */
lp->tx_len = lp->exec_box->data[9]; /* Transmit list count */
lp->rx_len = lp->exec_box->data[11]; /* Receive list count */
-
init_MUTEX_LOCKED(&lp->cmd_mutex
);
+
sema_init(&lp->cmd_mutex, 0
);
init_completion(&lp->execution_cmd);
init_completion(&lp->xceiver_cmd);
init_completion(&lp->execution_cmd);
init_completion(&lp->xceiver_cmd);