From 4ee37ee9742b1b913ee65705253158bea15d866f Mon Sep 17 00:00:00 2001 From: Federico Vaga Date: Sat, 29 Oct 2011 09:45:39 +0200 Subject: [PATCH] --- yaml --- r: 276319 b: refs/heads/master c: df30b21cb0eed5ba8a8e0cdfeebc66ba8cde821d h: refs/heads/master i: 276317: 302d9302cc59c4a762cf41794da2d99ba8725057 276315: 0122aa944b324fb5ab3e2f425dc8c4884b9ed923 276311: 993af75d060729c79880db3c495d1d66442019c0 276303: ca13641543609a2c14d79e6659b2bad1ad3a2f01 276287: 67b715b577bd6f1fdc1409192a66bf5d81bda642 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b73e6a76f627..5c4e2eacbc7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ffab428f40849ed5f21bcfd7285bdef7902f9ca +refs/heads/master: df30b21cb0eed5ba8a8e0cdfeebc66ba8cde821d diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index 156622a6f162..88caa7376999 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -1432,7 +1432,21 @@ static int do_cancel(struct comedi_device *dev, struct comedi_subdevice *s) return ret; } -static void comedi_unmap(struct vm_area_struct *area) + +static void comedi_vm_open(struct vm_area_struct *area) +{ + struct comedi_async *async; + struct comedi_device *dev; + + async = area->vm_private_data; + dev = async->subdevice->device; + + mutex_lock(&dev->mutex); + async->mmap_count++; + mutex_unlock(&dev->mutex); +} + +static void comedi_vm_close(struct vm_area_struct *area) { struct comedi_async *async; struct comedi_device *dev; @@ -1446,7 +1460,8 @@ static void comedi_unmap(struct vm_area_struct *area) } static struct vm_operations_struct comedi_vm_ops = { - .close = comedi_unmap, + .open = comedi_vm_open, + .close = comedi_vm_close, }; static int comedi_mmap(struct file *file, struct vm_area_struct *vma)