aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-17 12:13:31 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2010-02-17 11:48:25 -0500
commitf971dbd5da4e2fbf756d07b938a9c65a9c75178b (patch)
treed21b138ac2ea3ada0e27910425cfd988f72dbede /include/pcmcia
parentcfe5d809518eda3d5e2da87c5ccbe8647143573a (diff)
pcmcia: use pccardd to handle eject, insert, suspend and resume requests
This avoids any sysfs-related deadlock (or lockdep warning), such as reported at http://lkml.org/lkml/2010/1/17/88 . Reported-by: Ming Lei <tom.leiming@gmail.com> 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.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index cfaccc224b5..ea5dec8c0d7 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -200,13 +200,14 @@ struct pcmcia_socket {
200 struct task_struct *thread; 200 struct task_struct *thread;
201 struct completion thread_done; 201 struct completion thread_done;
202 unsigned int thread_events; 202 unsigned int thread_events;
203 unsigned int sysfs_events;
203 204
204 /* For the non-trivial interaction between these locks, 205 /* For the non-trivial interaction between these locks,
205 * see Documentation/pcmcia/locking.txt */ 206 * see Documentation/pcmcia/locking.txt */
206 struct mutex skt_mutex; 207 struct mutex skt_mutex;
207 struct mutex ops_mutex; 208 struct mutex ops_mutex;
208 209
209 /* protects thread_events */ 210 /* protects thread_events and sysfs_events */
210 spinlock_t thread_lock; 211 spinlock_t thread_lock;
211 212
212 /* pcmcia (16-bit) */ 213 /* pcmcia (16-bit) */