From 0e511b26694ce13ebc6c4de5de2dff8ff26cda92 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 5 Jan 2012 02:23:28 -0300
Subject: [PATCH] --- yaml --- r: 285751 b: refs/heads/master c:
 938ca36ef7914bd013acbff9f15e393fe79d71da h: refs/heads/master i:   285749:
 0a8a2567a7a0e247d37ef60706dab47fa9f07999   285747:
 72da15391e626e8ab3010260183aedbb81e14464   285743:
 3da8a610cb7ae94ad7f617aa90cc6b9d0cb77ef5 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/dvb/frontends/af9013.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 25e50f807871..6165c5a2ec41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27b93d8a45bd549146ae39b60ba168f62413c959
+refs/heads/master: 938ca36ef7914bd013acbff9f15e393fe79d71da
diff --git a/trunk/drivers/media/dvb/frontends/af9013.c b/trunk/drivers/media/dvb/frontends/af9013.c
index d5a95444a16e..6bcbcf543b38 100644
--- a/trunk/drivers/media/dvb/frontends/af9013.c
+++ b/trunk/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 {