Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/comedi/drivers/dt9812.c

+2 −2
Original line number Diff line number Diff line
@@ -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: