summaryrefslogtreecommitdiffstats
path: root/Documentation/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-17 19:31:45 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2010-02-17 17:48:24 +0100
commitcfe5d809518eda3d5e2da87c5ccbe8647143573a (patch)
treedd61ec285412fc0de8090ef5743b824447a9eeda /Documentation/pcmcia
parent3f565232c561fbd9d5e03354aac29b90cb2bc78a (diff)
downloadlinux-cfe5d809518eda3d5e2da87c5ccbe8647143573a.tar.gz
linux-cfe5d809518eda3d5e2da87c5ccbe8647143573a.tar.bz2
linux-cfe5d809518eda3d5e2da87c5ccbe8647143573a.zip
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.txt5
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:
socket_reset()
socket_setup()
- struct pccard_operations *ops
+ struct pccard_operations *ops
+ struct pccard_resource_ops *resource_ops;
Note that send_event() and struct pcmcia_callback *callback must not be
called with "ops_mutex" held.
@@ -54,7 +55,7 @@ protected by pcmcia_socket_list_rwsem;
2. Per-Socket Data:
-------------------
-The resource_ops are on their own to provide proper locking.
+The resource_ops and their data are protected by ops_mutex.
The "main" struct pcmcia_socket is protected as follows (read-only fields
or single-use fields not mentioned):