diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-12 21:42:51 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 17:48:13 +0100 |
| commit | 6b8e087b86c59c3941e125738d30cf38014089e0 (patch) | |
| tree | 08f77e50e5237e3bbe5e4c8f114fddc09f242628 /include | |
| parent | c6958fdb041db6ed77f24e871dd4af5f059d1a2b (diff) | |
| download | linux-6b8e087b86c59c3941e125738d30cf38014089e0.tar.bz2 | |
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')
| -rw-r--r-- | include/pcmcia/ss.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 9ab53d872489..e756069859b5 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h @@ -203,6 +203,8 @@ struct pcmcia_socket { unsigned int thread_events; /* protects socket h/w state */ struct mutex skt_mutex; + /* protects PCMCIA state */ + struct mutex ops_mutex; /* protects thread_events */ spinlock_t thread_lock; |