diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-01-05 00:23:28 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-06 14:17:43 -0500 |
commit | 938ca36ef7914bd013acbff9f15e393fe79d71da (patch) | |
tree | eae20edf7099caf476a33f4b36f443b25c538caf /drivers | |
parent | 27b93d8a45bd549146ae39b60ba168f62413c959 (diff) |
[media] af9013: change & to &&
This is just a cleanup, it doesn't change how the code works. These
are compound conditions and not bitwise operations so it should be &&
and not &.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/dvb/frontends/af9013.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c index d5a95444a16e..6bcbcf543b38 100644 --- a/drivers/media/dvb/frontends/af9013.c +++ b/drivers/media/dvb/frontends/af9013.c | |||
@@ -120,8 +120,8 @@ static int af9013_wr_regs(struct af9013_state *priv, u16 reg, const u8 *val, | |||
120 | int ret, i; | 120 | int ret, i; |
121 | u8 mbox = (0 << 7)|(0 << 6)|(1 << 1)|(1 << 0); | 121 | u8 mbox = (0 << 7)|(0 << 6)|(1 << 1)|(1 << 0); |
122 | 122 | ||
123 | if ((priv->config.ts_mode == AF9013_TS_USB) & | 123 | if ((priv->config.ts_mode == AF9013_TS_USB) && |
124 | ((reg & 0xff00) != 0xff00) & ((reg & 0xff00) != 0xae00)) { | 124 | ((reg & 0xff00) != 0xff00) && ((reg & 0xff00) != 0xae00)) { |
125 | mbox |= ((len - 1) << 2); | 125 | mbox |= ((len - 1) << 2); |
126 | ret = af9013_wr_regs_i2c(priv, mbox, reg, val, len); | 126 | ret = af9013_wr_regs_i2c(priv, mbox, reg, val, len); |
127 | } else { | 127 | } else { |
@@ -142,8 +142,8 @@ static int af9013_rd_regs(struct af9013_state *priv, u16 reg, u8 *val, int len) | |||
142 | int ret, i; | 142 | int ret, i; |
143 | u8 mbox = (0 << 7)|(0 << 6)|(1 << 1)|(0 << 0); | 143 | u8 mbox = (0 << 7)|(0 << 6)|(1 << 1)|(0 << 0); |
144 | 144 | ||
145 | if ((priv->config.ts_mode == AF9013_TS_USB) & | 145 | if ((priv->config.ts_mode == AF9013_TS_USB) && |
146 | ((reg & 0xff00) != 0xff00) & ((reg & 0xff00) != 0xae00)) { | 146 | ((reg & 0xff00) != 0xff00) && ((reg & 0xff00) != 0xae00)) { |
147 | mbox |= ((len - 1) << 2); | 147 | mbox |= ((len - 1) << 2); |
148 | ret = af9013_rd_regs_i2c(priv, mbox, reg, val, len); | 148 | ret = af9013_rd_regs_i2c(priv, mbox, reg, val, len); |
149 | } else { | 149 | } else { |