diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-01-05 02:23:28 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-06 17:17:43 -0200 |
| commit | 938ca36ef7914bd013acbff9f15e393fe79d71da (patch) | |
| tree | eae20edf7099caf476a33f4b36f443b25c538caf | |
| parent | 27b93d8a45bd549146ae39b60ba168f62413c959 (diff) | |
| download | linux-3.10-938ca36ef7914bd013acbff9f15e393fe79d71da.tar.gz linux-3.10-938ca36ef7914bd013acbff9f15e393fe79d71da.tar.bz2 linux-3.10-938ca36ef7914bd013acbff9f15e393fe79d71da.zip | |
[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>
| -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 d5a95444a16..6bcbcf543b3 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, int ret, i; u8 mbox = (0 << 7)|(0 << 6)|(1 << 1)|(1 << 0); - if ((priv->config.ts_mode == AF9013_TS_USB) & - ((reg & 0xff00) != 0xff00) & ((reg & 0xff00) != 0xae00)) { + if ((priv->config.ts_mode == AF9013_TS_USB) && + ((reg & 0xff00) != 0xff00) && ((reg & 0xff00) != 0xae00)) { mbox |= ((len - 1) << 2); ret = af9013_wr_regs_i2c(priv, mbox, reg, val, len); } else { @@ -142,8 +142,8 @@ static int af9013_rd_regs(struct af9013_state *priv, u16 reg, u8 *val, int len) int ret, i; u8 mbox = (0 << 7)|(0 << 6)|(1 << 1)|(0 << 0); - if ((priv->config.ts_mode == AF9013_TS_USB) & - ((reg & 0xff00) != 0xff00) & ((reg & 0xff00) != 0xae00)) { + if ((priv->config.ts_mode == AF9013_TS_USB) && + ((reg & 0xff00) != 0xff00) && ((reg & 0xff00) != 0xae00)) { mbox |= ((len - 1) << 2); ret = af9013_rd_regs_i2c(priv, mbox, reg, val, len); } else { |