diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2013-10-18 14:40:50 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 13:47:23 -0700 |
commit | 2e179e428ce47c3988eead1944b5043de07731ae (patch) | |
tree | 1ba682ada5f81b775fe01aea0069493c26119eaa /drivers/staging/comedi | |
parent | 6c661434f98dfe0ad301a4910b6209b0541c0239 (diff) | |
download | op-kernel-dev-2e179e428ce47c3988eead1944b5043de07731ae.zip op-kernel-dev-2e179e428ce47c3988eead1944b5043de07731ae.tar.gz |
staging: comedi: s626: specify bitshift for encoder A clock source
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>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index dd138a0..770c1d5 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -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); |