]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: comedi: s626: specify bitshift for encoder A clock source
authorIan Abbott <abbotti@mev.co.uk>
Fri, 18 Oct 2013 13:40:50 +0000 (14:40 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 19 Oct 2013 20:47:23 +0000 (13:47 -0700)
When setting the clock source for one of the 'A' encoders to operate in
"counter" mode in `s626_set_mode_a()`, bitshift the clock source value by
`S626_CRABIT_CLKSRC_A` for consistency with the other modes.  This has
no effect on the value since `S626_CRABIT_CLKSRC_A` is 0.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/s626.c

index dd138a095624e1d4b3b27a5d0b43f7f4b36688a3..770c1d5065c9cdc9d96c47a73d2b1ee7b1396655 100644 (file)
@@ -864,7 +864,7 @@ static void s626_set_mode_a(struct comedi_device *dev,
                break;
        default:                /* Counter Mode: */
                /* Select ENC_C and ENC_D as clock/direction inputs. */
-               cra |= S626_CLKSRC_COUNTER;
+               cra |= S626_CLKSRC_COUNTER << S626_CRABIT_CLKSRC_A;
                /* Clock polarity is passed through. */
                cra |= (setup & S626_STDMSK_CLKPOL) <<
                       (S626_CRABIT_CLKPOL_A - S626_STDBIT_CLKPOL);