Re: [PATCH 1/1] drivers: staging: comedi: drivers: ni_mio_common.c: removed no-effect right hand operand

[Ian Abbott]

On 13/05/15 05:53, Tolga Ceylan wrote:
> In ni_ai_cmd() bitwise or construction of ai_trig in case of TRIG_NOW
> is faulty. Register address is accidentally in the expression,
> but this has no effect. This is an accidental left-over code
> that used to call a function with register address as one of
> the arguments.
>
> Signed-off-by: Tolga Ceylan <tolga.ceylan@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 c741dde..9dfd4e6 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) +

Thanks.  The patch is fine, but Hartley has already sent the same fix to 
<devel@xxxxxxxxxxxxxxxxxxxxxx>, and Greg was intending to apply that one.

--
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@xxxxxxxxx> )=-
-=(                          Web: http://www.mev.co.uk/  )=-
--
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/