aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/rsrc_mgr.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/rsrc_mgr.c')
-rw-r--r--drivers/pcmcia/rsrc_mgr.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index cdd30c180066..b81586622d02 100644
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -23,14 +23,12 @@
23 23
24static int static_init(struct pcmcia_socket *s) 24static int static_init(struct pcmcia_socket *s)
25{ 25{
26 unsigned long flags;
27
28 /* the good thing about SS_CAP_STATIC_MAP sockets is 26 /* the good thing about SS_CAP_STATIC_MAP sockets is
29 * that they don't need a resource database */ 27 * that they don't need a resource database */
30 28
31 spin_lock_irqsave(&s->lock, flags); 29 mutex_lock(&s->ops_mutex);
32 s->resource_setup_done = 1; 30 s->resource_setup_done = 1;
33 spin_unlock_irqrestore(&s->lock, flags); 31 mutex_unlock(&s->ops_mutex);
34 32
35 return 0; 33 return 0;
36} 34}