Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317905
b: refs/heads/master
c: 18e18dd
h: refs/heads/master
i:
  317903: 463e4eb
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 13, 2012
1 parent 13d9d1c commit b0ec130
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 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: 0eecf787f3cf0f805e0d12ee14956225c7d26d6a
refs/heads/master: 18e18ddded6bbcefb0a1b0a4d111bd3aef661b7b
4 changes: 1 addition & 3 deletions trunk/drivers/staging/comedi/drivers/rtd520.c
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,6 @@ struct rtdPrivate {
/* Macros to access registers */

/* pacer start/stop read=start, write=stop*/
#define RtdPacerStart(dev) \
readl(devpriv->las0+LAS0_PACER)
#define RtdPacerStop(dev) \
writel(0, devpriv->las0+LAS0_PACER)

Expand Down Expand Up @@ -1609,7 +1607,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)

/* BUG: start_src is ASSUMED to be TRIG_NOW */
/* BUG? it seems like things are running before the "start" */
RtdPacerStart(dev); /* Start PACER */
readl(devpriv->las0 + LAS0_PACER);
return 0;
}

Expand Down

0 comments on commit b0ec130

Please sign in to comment.