Commit cba2c993 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman

Staging: comedi: logical || vs bitwise |

These are bitfields and the intend was to OR them together.  A logical
OR here is simply 1.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 22494ed9
...@@ -527,7 +527,7 @@ static void dt9812_configure_gain(struct usb_dt9812 *dev, ...@@ -527,7 +527,7 @@ static void dt9812_configure_gain(struct usb_dt9812 *dev,
* 11x -> Gain = 0.5 * 11x -> Gain = 0.5
*/ */
case DT9812_GAIN_0PT5: case DT9812_GAIN_0PT5:
rmw->or_value = F020_MASK_ADC0CF_AMP0GN2 || rmw->or_value = F020_MASK_ADC0CF_AMP0GN2 |
F020_MASK_ADC0CF_AMP0GN1; F020_MASK_ADC0CF_AMP0GN1;
break; break;
case DT9812_GAIN_1: case DT9812_GAIN_1:
...@@ -540,7 +540,7 @@ static void dt9812_configure_gain(struct usb_dt9812 *dev, ...@@ -540,7 +540,7 @@ static void dt9812_configure_gain(struct usb_dt9812 *dev,
rmw->or_value = F020_MASK_ADC0CF_AMP0GN1; rmw->or_value = F020_MASK_ADC0CF_AMP0GN1;
break; break;
case DT9812_GAIN_8: case DT9812_GAIN_8:
rmw->or_value = F020_MASK_ADC0CF_AMP0GN1 || rmw->or_value = F020_MASK_ADC0CF_AMP0GN1 |
F020_MASK_ADC0CF_AMP0GN0; F020_MASK_ADC0CF_AMP0GN0;
break; break;
case DT9812_GAIN_16: case DT9812_GAIN_16:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment