summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-06-26 04:40:38 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-06 14:54:32 -0300
commit22a09b439af25fefbe0ebd1c6c2a0d81e923f2f5 (patch)
treea26c089f4ac18e3b4d83d7b7bf65d6c3a3bd9d41
parentab9cbcd36ce2f2d10de1610abeaa89ee0b619ae7 (diff)
downloadlinux-stable-22a09b439af25fefbe0ebd1c6c2a0d81e923f2f5.tar.gz
linux-stable-22a09b439af25fefbe0ebd1c6c2a0d81e923f2f5.tar.bz2
linux-stable-22a09b439af25fefbe0ebd1c6c2a0d81e923f2f5.zip
[media] drxk: fix a '&' vs '|' bug
IQM_AF_CLKNEG_CLKNEGDATA__M is 0x2 and IQM_AF_CLKNEG_CLKNEGDATA_CLK_ADC_DATA_POS is 0. (clkNeg | 0x2) is never equal to zero so the condition can never be true. I consulted with Ralph Metzler and the '|' should be changed to a '&'. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> CC: Ralph Metzler <rjkm@metzlerbros.de> Tested-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/frontends/drxk_hard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c
index 8fa28bb47088..317530f891c0 100644
--- a/drivers/media/dvb/frontends/drxk_hard.c
+++ b/drivers/media/dvb/frontends/drxk_hard.c
@@ -3004,7 +3004,7 @@ static int ADCSynchronization(struct drxk_state *state)
status = read16(state, IQM_AF_CLKNEG__A, &clkNeg);
if (status < 0)
goto error;
- if ((clkNeg | IQM_AF_CLKNEG_CLKNEGDATA__M) ==
+ if ((clkNeg & IQM_AF_CLKNEG_CLKNEGDATA__M) ==
IQM_AF_CLKNEG_CLKNEGDATA_CLK_ADC_DATA_POS) {
clkNeg &= (~(IQM_AF_CLKNEG_CLKNEGDATA__M));
clkNeg |=