From b0ec13016589814fc240953cc0fac738811b4a4a Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 10 Jul 2012 16:51:46 -0700 Subject: [PATCH] --- yaml --- r: 317905 b: refs/heads/master c: 18e18ddded6bbcefb0a1b0a4d111bd3aef661b7b h: refs/heads/master i: 317903: 463e4eb944396b74506d5e4d43055029858cdbc9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rtd520.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1e4dfcf232b9..816d6afa7321 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0eecf787f3cf0f805e0d12ee14956225c7d26d6a +refs/heads/master: 18e18ddded6bbcefb0a1b0a4d111bd3aef661b7b diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c index 3b4477642bc0..190f28773bbe 100644 --- a/trunk/drivers/staging/comedi/drivers/rtd520.c +++ b/trunk/drivers/staging/comedi/drivers/rtd520.c @@ -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) @@ -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; }