pcmcia: properly lock skt->irq, skt->irq_mask

Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index f365ecb9c5cd1b09d58871ed2d8e3b3c37cfdb67..f0de7b8b123ba92ce3bccb11d74e511444bbd5aa 100644 (file)
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -419,7 +419,9 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)
                dev_dbg(&s->dev, "IRQ attributes must match assigned ones\n");
                return -EINVAL;
        }
+       mutex_lock(&s->ops_mutex);
        if (s->irq.AssignedIRQ != req->AssignedIRQ) {
+               mutex_unlock(&s->ops_mutex);
                dev_dbg(&s->dev, "IRQ must match assigned one\n");
                return -EINVAL;
        }
@@ -434,6 +436,7 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)
 #ifdef CONFIG_PCMCIA_PROBE
        pcmcia_used_irq[req->AssignedIRQ]--;
 #endif
+       mutex_unlock(&s->ops_mutex);
 
        return 0;
 } /* pcmcia_release_irq */

diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index 537d79305e7a19318f5030bf4284233491eca74c..1cba9d38d8132f4ea91eb7abaeaef75601db47d4 100644 (file)
--- 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,
        ret = sscanf(buf, "0x%x\n", &mask);
 
        if (ret == 1) {
+               mutex_lock(&s->ops_mutex);
                s->irq_mask &= mask;
+               mutex_unlock(&s->ops_mutex);
                ret = 0;
        }