* [PATCH] Staging: comedi: Removed expression that has no effect
@ 2015-05-12 21:03 Adrian Remonda
2015-05-12 21:19 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Adrian Remonda @ 2015-05-12 21:03 UTC (permalink / raw)
Cc: Adrian Remonda, Ian Abbott, H Hartley Sweeten,
Greg Kroah-Hartman, open list:STAGING SUBSYSTEM, open list
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@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Staging: comedi: Removed expression that has no effect
2015-05-12 21:03 [PATCH] Staging: comedi: Removed expression that has no effect Adrian Remonda
@ 2015-05-12 21:19 ` Greg Kroah-Hartman
2015-05-14 13:57 ` AdrianRemonda
0 siblings, 1 reply; 3+ messages in thread
From: Greg Kroah-Hartman @ 2015-05-12 21:19 UTC (permalink / raw)
To: Adrian Remonda
Cc: Ian Abbott, H Hartley Sweeten, open list:STAGING SUBSYSTEM, open list
On Tue, May 12, 2015 at 11:03:52PM +0200, Adrian Remonda wrote:
> 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
What does this line mean here?
And Hartley sent a fix for this yesterday, I haven't had a chance to
apply it yet...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Staging: comedi: Removed expression that has no effect
2015-05-12 21:19 ` Greg Kroah-Hartman
@ 2015-05-14 13:57 ` AdrianRemonda
0 siblings, 0 replies; 3+ messages in thread
From: AdrianRemonda @ 2015-05-14 13:57 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Ian Abbott, H Hartley Sweeten, open list:STAGING SUBSYSTEM, open list
On Tue, May 12, 2015 at 02:19:01PM -0700, Greg Kroah-Hartman wrote:
> On Tue, May 12, 2015 at 11:03:52PM +0200, Adrian Remonda wrote:
> > 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
>
> What does this line mean here?
>
> And Hartley sent a fix for this yesterday, I haven't had a chance to
> apply it yet...
>
> thanks,
>
> greg k-h
Sorry I did't see that there was a previous fix.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-14 13:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-12 21:03 [PATCH] Staging: comedi: Removed expression that has no effect Adrian Remonda
2015-05-12 21:19 ` Greg Kroah-Hartman
2015-05-14 13:57 ` AdrianRemonda
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.