diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-15 19:14:38 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 11:48:17 -0500 |
commit | 64d8d46f5f501a19aec4db7ff93faf1b831d05ed (patch) | |
tree | eae12e7cfea8259449eb14da6e449938773ac1fe /drivers/pcmcia/socket_sysfs.c | |
parent | 9e86749cff70fca505c7c1a9dc760d193f27a059 (diff) |
pcmcia: properly lock skt->irq, skt->irq_mask
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/socket_sysfs.c')
-rw-r--r-- | drivers/pcmcia/socket_sysfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c index 537d79305e7a..1cba9d38d813 100644 --- a/drivers/pcmcia/socket_sysfs.c +++ b/drivers/pcmcia/socket_sysfs.c | |||
@@ -167,7 +167,9 @@ static ssize_t pccard_store_irq_mask(struct device *dev, | |||
167 | ret = sscanf(buf, "0x%x\n", &mask); | 167 | ret = sscanf(buf, "0x%x\n", &mask); |
168 | 168 | ||
169 | if (ret == 1) { | 169 | if (ret == 1) { |
170 | mutex_lock(&s->ops_mutex); | ||
170 | s->irq_mask &= mask; | 171 | s->irq_mask &= mask; |
172 | mutex_unlock(&s->ops_mutex); | ||
171 | ret = 0; | 173 | ret = 0; |
172 | } | 174 | } |
173 | 175 | ||