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: Dan Carpenter <[email protected]>
Acked-by: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c
index 32d9c42e96593fb09c83003fada792e06cc2c4f3..e86ab5862895dde35466d20c2c1dec38d10aa154 100644 (file)
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -527,7 +527,7 @@ static void dt9812_configure_gain(struct usb_dt9812 *dev,
                 * 11x -> Gain =  0.5
                 */
        case DT9812_GAIN_0PT5:
-               rmw->or_value = F020_MASK_ADC0CF_AMP0GN2 ||
+               rmw->or_value = F020_MASK_ADC0CF_AMP0GN2 |
                    F020_MASK_ADC0CF_AMP0GN1;
                break;
        case DT9812_GAIN_1:
@@ -540,7 +540,7 @@ static void dt9812_configure_gain(struct usb_dt9812 *dev,
                rmw->or_value = F020_MASK_ADC0CF_AMP0GN1;
                break;
        case DT9812_GAIN_8:
-               rmw->or_value = F020_MASK_ADC0CF_AMP0GN1 ||
+               rmw->or_value = F020_MASK_ADC0CF_AMP0GN1 |
                    F020_MASK_ADC0CF_AMP0GN0;
                break;
        case DT9812_GAIN_16: