diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-17 13:31:45 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 11:48:24 -0500 |
commit | cfe5d809518eda3d5e2da87c5ccbe8647143573a (patch) | |
tree | dd61ec285412fc0de8090ef5743b824447a9eeda /Documentation/pcmcia | |
parent | 3f565232c561fbd9d5e03354aac29b90cb2bc78a (diff) |
pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'Documentation/pcmcia')
-rw-r--r-- | Documentation/pcmcia/locking.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/pcmcia/locking.txt b/Documentation/pcmcia/locking.txt index d6251056128f..68f622bc4064 100644 --- a/Documentation/pcmcia/locking.txt +++ b/Documentation/pcmcia/locking.txt | |||
@@ -36,7 +36,8 @@ be called with "ops_mutex" held: | |||
36 | socket_reset() | 36 | socket_reset() |
37 | socket_setup() | 37 | socket_setup() |
38 | 38 | ||
39 | struct pccard_operations *ops | 39 | struct pccard_operations *ops |
40 | struct pccard_resource_ops *resource_ops; | ||
40 | 41 | ||
41 | Note that send_event() and struct pcmcia_callback *callback must not be | 42 | Note that send_event() and struct pcmcia_callback *callback must not be |
42 | called with "ops_mutex" held. | 43 | called with "ops_mutex" held. |
@@ -54,7 +55,7 @@ protected by pcmcia_socket_list_rwsem; | |||
54 | 55 | ||
55 | 2. Per-Socket Data: | 56 | 2. Per-Socket Data: |
56 | ------------------- | 57 | ------------------- |
57 | The resource_ops are on their own to provide proper locking. | 58 | The resource_ops and their data are protected by ops_mutex. |
58 | 59 | ||
59 | The "main" struct pcmcia_socket is protected as follows (read-only fields | 60 | The "main" struct pcmcia_socket is protected as follows (read-only fields |
60 | or single-use fields not mentioned): | 61 | or single-use fields not mentioned): |