From 16fd8707fc08d949393fc67069c0c3623f0e81a2 Mon Sep 17 00:00:00 2001 From: Ravishankar karkala Mallikarjunayya Date: Mon, 21 Nov 2011 16:07:06 +0530 Subject: [PATCH] --- yaml --- r: 281121 b: refs/heads/master c: 0389245f0c5692111c0dc8d997fc4af72d789472 h: refs/heads/master i: 281119: 3513602502db81ec214654476b95bfe327574eb6 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcmuio.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index cf1853d842c3..a1a117530d15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34dac67d6c494c04d025977b5ec1a0f14b9aa299 +refs/heads/master: 0389245f0c5692111c0dc8d997fc4af72d789472 diff --git a/trunk/drivers/staging/comedi/drivers/pcmuio.c b/trunk/drivers/staging/comedi/drivers/pcmuio.c index b2c2c8971a32..0c5b06dcbe10 100644 --- a/trunk/drivers/staging/comedi/drivers/pcmuio.c +++ b/trunk/drivers/staging/comedi/drivers/pcmuio.c @@ -951,14 +951,13 @@ pcmuio_inttrig_start_intr(struct comedi_device *dev, struct comedi_subdevice *s, spin_lock_irqsave(&subpriv->intr.spinlock, flags); s->async->inttrig = 0; - if (subpriv->intr.active) { + if (subpriv->intr.active) event = pcmuio_start_intr(dev, s); - } + spin_unlock_irqrestore(&subpriv->intr.spinlock, flags); - if (event) { + if (event) comedi_event(dev, s); - } return 1; } @@ -1000,9 +999,8 @@ static int pcmuio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) } spin_unlock_irqrestore(&subpriv->intr.spinlock, flags); - if (event) { + if (event) comedi_event(dev, s); - } return 0; }