From 41eeea41b85d36e780308613b4aeac849a54031c Mon Sep 17 00:00:00 2001 From: Ravishankar Karkala Mallikarjunayya Date: Thu, 26 Apr 2012 15:32:20 +0530 Subject: [PATCH] --- yaml --- r: 304529 b: refs/heads/master c: 949fd38c7b22168bc16fea100a51c8d4a3eab144 h: refs/heads/master i: 304527: 31e75293662ddd93ffa3594e0fdf461d9795614a v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/ni_at_a2150.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c3c606eb5fa4..1abd0dd6ccdd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 190908ba6dd1e17f00cb7f403d31c19feeeb63bf +refs/heads/master: 949fd38c7b22168bc16fea100a51c8d4a3eab144 diff --git a/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c b/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c index c25e44c1905e..4fc469da45e2 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c +++ b/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c @@ -539,7 +539,10 @@ static int a2150_ai_cmdtest(struct comedi_device *dev, if (err) return 1; - /* step 2: make sure trigger sources are unique and mutually compatible */ + /* + * step 2: make sure trigger sources are unique and mutually + * compatible + */ if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT) err++; @@ -771,7 +774,10 @@ static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, /* start acquisition for soft trigger */ outw(0, dev->iobase + FIFO_START_REG); - /* there is a 35.6 sample delay for data to get through the antialias filter */ + /* + * there is a 35.6 sample delay for data to get through the + * antialias filter + */ for (n = 0; n < filter_delay; n++) { for (i = 0; i < timeout; i++) { if (inw(dev->iobase + STATUS_REG) & FNE_BIT) @@ -812,8 +818,10 @@ static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, return n; } -/* sets bits in devpriv->clock_bits to nearest approximation of requested period, - * adjusts requested period to actual timing. */ +/* + * sets bits in devpriv->clock_bits to nearest approximation of requested + * period, adjusts requested period to actual timing. + */ static int a2150_get_timing(struct comedi_device *dev, unsigned int *period, int flags) {