Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317263
b: refs/heads/master
c: f59f231
h: refs/heads/master
i:
  317261: 3047d1c
  317259: e316f13
  317255: 21a0888
  317247: fb5d0a5
v: v3
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Jun 11, 2012
1 parent 5be51bd commit 668df9e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 27494c092a81847fef515549b76251d96b760619
refs/heads/master: f59f231e3db835353d8d1ff91062d89140dc8be3
2 changes: 2 additions & 0 deletions trunk/drivers/staging/comedi/drivers/amplc_pci230.c
Original file line number Diff line number Diff line change
Expand Up @@ -1387,6 +1387,8 @@ static int pci230_ao_inttrig_scan_begin(struct comedi_device *dev,
/* Delay. Should driver be responsible for this? */
/* XXX TODO: See if DAC busy bit can be used. */
udelay(8);
} else {
spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, irqflags);
}

return 1;
Expand Down

0 comments on commit 668df9e

Please sign in to comment.