Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317899
b: refs/heads/master
c: dcfbb64
h: refs/heads/master
i:
  317897: ad4df32
  317895: c490f0a
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 13, 2012
1 parent 1171004 commit 784ba95
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 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: c777b2ab2cffab9054e4bf777d6ccc35d18a0c58
refs/heads/master: dcfbb64cc108435ae336f9b44014212a02f6bdf1
6 changes: 1 addition & 5 deletions trunk/drivers/staging/comedi/drivers/rtd520.c
Original file line number Diff line number Diff line change
Expand Up @@ -406,10 +406,6 @@ struct rtdPrivate {

/* Macros to access registers */

/* Set About counter stop enable (write only) */
#define RtdAboutStopEnable(dev, v) \
writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_ACNT_STOP_ENABLE)

/* Set external trigger polarity (write only) 0=positive edge, 1=negative */
#define RtdTriggerPolarity(dev, v) \
writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_ETRG_POLARITY)
Expand Down Expand Up @@ -1533,7 +1529,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->flags &= ~SEND_EOS;
}
writel(1, devpriv->las0 + LAS0_PACER_SELECT);
RtdAboutStopEnable(dev, 1); /* just interrupt, dont stop */
writel(1, devpriv->las0 + LAS0_ACNT_STOP_ENABLE);

/* BUG??? these look like enumerated values, but they are bit fields */

Expand Down

0 comments on commit 784ba95

Please sign in to comment.