[PATCH] Staging: comedi: Removed expression that has no effect

From: Adrian Remonda
Date: Tue May 12 2015 - 17:04:18 EST


This patch remove a register from an '|' expression.
It is wrong since after in the code, the variable ai_trig gets
written back to that register.


modified: drivers/staging/comedi/drivers/ni_mio_common.c

Signed-off-by: Adrian Remonda <adrianremonda@xxxxxxxxx>
---
drivers/staging/comedi/drivers/ni_mio_common.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index c741dde9c0bb..9dfd4e6e6ced 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -2268,8 +2268,7 @@ static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
case TRIG_INT:
case TRIG_NOW:
ai_trig |= NISTC_AI_TRIG_START1_EDGE |
- NISTC_AI_TRIG_START1_SEL(0),
- NISTC_AI_TRIG_SEL_REG;
+ NISTC_AI_TRIG_START1_SEL(0);
break;
case TRIG_EXT:
ai_trig |= NISTC_AI_TRIG_START1_SEL(CR_CHAN(cmd->start_arg) +
--
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/