aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pcmcia_ioctl.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-17 13:31:45 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2010-02-17 11:48:24 -0500
commitcfe5d809518eda3d5e2da87c5ccbe8647143573a (patch)
treedd61ec285412fc0de8090ef5743b824447a9eeda /drivers/pcmcia/pcmcia_ioctl.c
parent3f565232c561fbd9d5e03354aac29b90cb2bc78a (diff)
pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking
Tested-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/pcmcia_ioctl.c')
-rw-r--r--drivers/pcmcia/pcmcia_ioctl.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index db2e3db8008b..96fd236f52a9 100644
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -187,7 +187,6 @@ static int pcmcia_adjust_resource_info(adjust_t *adj)
187 continue; 187 continue;
188 } else if (!(s->resource_setup_old)) 188 } else if (!(s->resource_setup_old))
189 s->resource_setup_old = 1; 189 s->resource_setup_old = 1;
190 mutex_unlock(&s->ops_mutex);
191 190
192 switch (adj->Resource) { 191 switch (adj->Resource) {
193 case RES_MEMORY_RANGE: 192 case RES_MEMORY_RANGE:
@@ -206,10 +205,9 @@ static int pcmcia_adjust_resource_info(adjust_t *adj)
206 * last call to adjust_resource_info, we 205 * last call to adjust_resource_info, we
207 * always need to assume this is the latest 206 * always need to assume this is the latest
208 * one... */ 207 * one... */
209 mutex_lock(&s->ops_mutex);
210 s->resource_setup_done = 1; 208 s->resource_setup_done = 1;
211 mutex_unlock(&s->ops_mutex);
212 } 209 }
210 mutex_unlock(&s->ops_mutex);
213 } 211 }
214 } 212 }
215 up_read(&pcmcia_socket_list_rwsem); 213 up_read(&pcmcia_socket_list_rwsem);