summary refs log tree commit diff
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-09 09:36:59 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-11 06:56:49 -0300
commit87bf0e54872097de30752b8dc0f90eff8c53a11d (patch)
treeefdfa5d7aeee5ea63c38d96079337269138a98ef /drivers/media
parentdb5657c5ec47d3a787d4be300f97041ada51f806 (diff)
downloadlinux-87bf0e54872097de30752b8dc0f90eff8c53a11d.tar.gz
[media] drx-j: Fix dubious usage of "&" instead of "&&"
Fixes the following warnings:
	drivers/media/dvb-frontends/drx39xyj/drxj.c:16764:68: warning: dubious: x & !y
	drivers/media/dvb-frontends/drx39xyj/drxj.c:16778:68: warning: dubious: x & !y
	drivers/media/dvb-frontends/drx39xyj/drxj.c:16797:68: warning: dubious: x & !y

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb-frontends/drx39xyj/drxj.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c
index af3b69ce8c16..1e6dab7e5892 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drxj.c
+++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c
@@ -16762,12 +16762,12 @@ static int ctrl_set_oob(struct drx_demod_instance *demod, struct drxoob *oob_par
 	case DRX_OOB_MODE_A:
 		if (
 			   /* signal is transmitted inverted */
-			   ((oob_param->spectrum_inverted == true) &
+			   ((oob_param->spectrum_inverted == true) &&
 			    /* and tuner is not mirroring the signal */
 			    (!mirror_freq_spect_oob)) |
 			   /* or */
 			   /* signal is transmitted noninverted */
-			   ((oob_param->spectrum_inverted == false) &
+			   ((oob_param->spectrum_inverted == false) &&
 			    /* and tuner is mirroring the signal */
 			    (mirror_freq_spect_oob))
 		    )
@@ -16780,12 +16780,12 @@ static int ctrl_set_oob(struct drx_demod_instance *demod, struct drxoob *oob_par
 	case DRX_OOB_MODE_B_GRADE_A:
 		if (
 			   /* signal is transmitted inverted */
-			   ((oob_param->spectrum_inverted == true) &
+			   ((oob_param->spectrum_inverted == true) &&
 			    /* and tuner is not mirroring the signal */
 			    (!mirror_freq_spect_oob)) |
 			   /* or */
 			   /* signal is transmitted noninverted */
-			   ((oob_param->spectrum_inverted == false) &
+			   ((oob_param->spectrum_inverted == false) &&
 			    /* and tuner is mirroring the signal */
 			    (mirror_freq_spect_oob))
 		    )
@@ -16799,12 +16799,12 @@ static int ctrl_set_oob(struct drx_demod_instance *demod, struct drxoob *oob_par
 	default:
 		if (
 			   /* signal is transmitted inverted */
-			   ((oob_param->spectrum_inverted == true) &
+			   ((oob_param->spectrum_inverted == true) &&
 			    /* and tuner is not mirroring the signal */
 			    (!mirror_freq_spect_oob)) |
 			   /* or */
 			   /* signal is transmitted noninverted */
-			   ((oob_param->spectrum_inverted == false) &
+			   ((oob_param->spectrum_inverted == false) &&
 			    /* and tuner is mirroring the signal */
 			    (mirror_freq_spect_oob))
 		    )