projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[cascardo/linux.git]
/
drivers
/
net
/
cassini.h
diff --git
a/drivers/net/cassini.h
b/drivers/net/cassini.h
index
88063ef
..
ab55c7e
100644
(file)
--- a/
drivers/net/cassini.h
+++ b/
drivers/net/cassini.h
@@
-4284,7
+4284,7
@@
struct cas {
* (ie. not power managed) */
int hw_running;
int opened;
* (ie. not power managed) */
int hw_running;
int opened;
- struct
semaphore pm_sem
; /* open/close/suspend/resume */
+ struct
mutex pm_mutex
; /* open/close/suspend/resume */
struct cas_init_block *init_block;
struct cas_tx_desc *init_txds[MAX_TX_RINGS];
struct cas_init_block *init_block;
struct cas_tx_desc *init_txds[MAX_TX_RINGS];