aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/pcmcia
diff options
context:
space:
mode:
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:
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
41Note that send_event() and struct pcmcia_callback *callback must not be 42Note that send_event() and struct pcmcia_callback *callback must not be
42called with "ops_mutex" held. 43called with "ops_mutex" held.
@@ -54,7 +55,7 @@ protected by pcmcia_socket_list_rwsem;
54 55
552. Per-Socket Data: 562. Per-Socket Data:
56------------------- 57-------------------
57The resource_ops are on their own to provide proper locking. 58The resource_ops and their data are protected by ops_mutex.
58 59
59The "main" struct pcmcia_socket is protected as follows (read-only fields 60The "main" struct pcmcia_socket is protected as follows (read-only fields
60or single-use fields not mentioned): 61or single-use fields not mentioned):