diff options
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/maps/pcmciamtd.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c index e8e9fec23553..7d5cf369f0ad 100644 --- a/drivers/mtd/maps/pcmciamtd.c +++ b/drivers/mtd/maps/pcmciamtd.c | |||
@@ -295,13 +295,24 @@ static void pcmcia_copy_to(struct map_info *map, unsigned long to, const void *f | |||
295 | } | 295 | } |
296 | 296 | ||
297 | 297 | ||
298 | static DEFINE_SPINLOCK(pcmcia_vpp_lock); | ||
299 | static int pcmcia_vpp_refcnt; | ||
298 | static void pcmciamtd_set_vpp(struct map_info *map, int on) | 300 | static void pcmciamtd_set_vpp(struct map_info *map, int on) |
299 | { | 301 | { |
300 | struct pcmciamtd_dev *dev = (struct pcmciamtd_dev *)map->map_priv_1; | 302 | struct pcmciamtd_dev *dev = (struct pcmciamtd_dev *)map->map_priv_1; |
301 | struct pcmcia_device *link = dev->p_dev; | 303 | struct pcmcia_device *link = dev->p_dev; |
304 | unsigned long flags; | ||
302 | 305 | ||
303 | pr_debug("dev = %p on = %d vpp = %d\n\n", dev, on, dev->vpp); | 306 | pr_debug("dev = %p on = %d vpp = %d\n\n", dev, on, dev->vpp); |
304 | pcmcia_fixup_vpp(link, on ? dev->vpp : 0); | 307 | spin_lock_irqsave(&pcmcia_vpp_lock, flags); |
308 | if (on) { | ||
309 | if (++pcmcia_vpp_refcnt == 1) /* first nested 'on' */ | ||
310 | pcmcia_fixup_vpp(link, dev->vpp); | ||
311 | } else { | ||
312 | if (--pcmcia_vpp_refcnt == 0) /* last nested 'off' */ | ||
313 | pcmcia_fixup_vpp(link, 0); | ||
314 | } | ||
315 | spin_unlock_irqrestore(&pcmcia_vpp_lock, flags); | ||
305 | } | 316 | } |
306 | 317 | ||
307 | 318 | ||