Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

[linux-drm-fsl-dcu.git] / drivers / mtd / maps / pcmciamtd.c

diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 0259cf5830222e4c2da75f921be90c8517bd8c15..a3cfad392ed653c1543a5318ddfc40f007b72233 100644 (file)
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -294,13 +294,24 @@ static void pcmcia_copy_to(struct map_info *map, unsigned long to, const void *f
 }
 
 
+static DEFINE_SPINLOCK(pcmcia_vpp_lock);
+static int pcmcia_vpp_refcnt;
 static void pcmciamtd_set_vpp(struct map_info *map, int on)
 {
        struct pcmciamtd_dev *dev = (struct pcmciamtd_dev *)map->map_priv_1;
        struct pcmcia_device *link = dev->p_dev;
+       unsigned long flags;
 
        pr_debug("dev = %p on = %d vpp = %d\n\n", dev, on, dev->vpp);
-       pcmcia_fixup_vpp(link, on ? dev->vpp : 0);
+       spin_lock_irqsave(&pcmcia_vpp_lock, flags);
+       if (on) {
+               if (++pcmcia_vpp_refcnt == 1)   /* first nested 'on' */
+                       pcmcia_fixup_vpp(link, dev->vpp);
+       } else {
+               if (--pcmcia_vpp_refcnt == 0)   /* last nested 'off' */
+                       pcmcia_fixup_vpp(link, 0);
+       }
+       spin_unlock_irqrestore(&pcmcia_vpp_lock, flags);
 }