Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281121
b: refs/heads/master
c: 0389245
h: refs/heads/master
i:
  281119: 3513602
v: v3
  • Loading branch information
Ravishankar karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Nov 27, 2011
1 parent 317782a commit 16fd870
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 34dac67d6c494c04d025977b5ec1a0f14b9aa299
refs/heads/master: 0389245f0c5692111c0dc8d997fc4af72d789472
10 changes: 4 additions & 6 deletions trunk/drivers/staging/comedi/drivers/pcmuio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 16fd870

Please sign in to comment.