|
@@ -731,9 +731,8 @@ static int a2150_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
|
|
|
outw(trigger_bits, dev->iobase + TRIGGER_REG);
|
|
|
|
|
|
/* start acquisition for soft trigger */
|
|
|
- if (cmd->start_src == TRIG_NOW) {
|
|
|
+ if (cmd->start_src == TRIG_NOW)
|
|
|
outw(0, dev->iobase + FIFO_START_REG);
|
|
|
- }
|
|
|
#ifdef A2150_DEBUG
|
|
|
ni_dump_regs(dev);
|
|
|
#endif
|
|
@@ -860,11 +859,10 @@ static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,
|
|
|
case TRIG_ROUND_NEAREST:
|
|
|
default:
|
|
|
/* if least upper bound is better approximation */
|
|
|
- if (lub - *period < *period - glb) {
|
|
|
+ if (lub - *period < *period - glb)
|
|
|
*period = lub;
|
|
|
- } else {
|
|
|
+ else
|
|
|
*period = glb;
|
|
|
- }
|
|
|
break;
|
|
|
case TRIG_ROUND_UP:
|
|
|
*period = lub;
|