aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-12 15:42:51 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2010-02-17 11:48:13 -0500
commit6b8e087b86c59c3941e125738d30cf38014089e0 (patch)
tree08f77e50e5237e3bbe5e4c8f114fddc09f242628 /include/pcmcia
parentc6958fdb041db6ed77f24e871dd4af5f059d1a2b (diff)
pcmcia: add locking to set_mem_map()
Protect the pccard_operations callback "set_mem_map" by a new mutex ops_mutex. This mutex also protects the following values in struct pcmcia_socket: pccard_mem_map win[] pccard_mem_map cis_mem void __iomem *cis_virt Tested-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia')
-rw-r--r--include/pcmcia/ss.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 9ab53d87248..e756069859b 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -203,6 +203,8 @@ struct pcmcia_socket {
203 unsigned int thread_events; 203 unsigned int thread_events;
204 /* protects socket h/w state */ 204 /* protects socket h/w state */
205 struct mutex skt_mutex; 205 struct mutex skt_mutex;
206 /* protects PCMCIA state */
207 struct mutex ops_mutex;
206 /* protects thread_events */ 208 /* protects thread_events */
207 spinlock_t thread_lock; 209 spinlock_t thread_lock;
208 210