From a015c24ebdd3a5043f482f87b07fb859a83fc74f Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat, 21 Jan 2012 13:52:39 -0200
Subject: [PATCH] --- yaml --- r: 294875 b: refs/heads/master c:
 9e5e3097a3febbf317abc6d1b07bc6c33b20c279 h: refs/heads/master i:   294873:
 b33ca2a6fa6b64337fd5c236af5ea9a6d7a8d8fd   294871:
 229083708453abe3e3af490ff2ade6e9bd422e96 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/dvb/dvb-usb/az6007.c | 27 ++++++++++++------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 4124772d4d1b..3a9bd2b9c272 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44744f9b982049da0f89c560d91bd2549aedf0a0
+refs/heads/master: 9e5e3097a3febbf317abc6d1b07bc6c33b20c279
diff --git a/trunk/drivers/media/dvb/dvb-usb/az6007.c b/trunk/drivers/media/dvb/dvb-usb/az6007.c
index 14733b84e8b8..02efd94dc72b 100644
--- a/trunk/drivers/media/dvb/dvb-usb/az6007.c
+++ b/trunk/drivers/media/dvb/dvb-usb/az6007.c
@@ -211,9 +211,7 @@ static int az6007_rc_query(struct dvb_usb_device *d)
 	if ((st->data[3] ^ st->data[4]) == 0xff)
 		code = code << 8 | st->data[3];
 	else
-		code = code << 16 | st->data[3] << 8| st->data[4];
-
-	printk("remote query key: %04x\n", code);
+		code = code << 16 | st->data[3] << 8 | st->data[4];
 
 	rc_keydown(d->rc_dev, code, st->data[5]);
 
@@ -302,11 +300,11 @@ int az6007_power_ctrl(struct dvb_usb_device *d, int onoff)
 		ret = az6007_write(d, FX2_SCON1, 0, 3, NULL, 0);
 		if (ret < 0)
 			return ret;
-		msleep (150);
+		msleep(150);
 		ret = az6007_write(d, FX2_SCON1, 1, 3, NULL, 0);
 		if (ret < 0)
 			return ret;
-		msleep (430);
+		msleep(430);
 		ret = az6007_write(d, AZ6007_POWER, 0, 0, NULL, 0);
 		if (ret < 0)
 			return ret;
@@ -362,8 +360,8 @@ static int az6007_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
 			value = addr | (1 << 8);
 			length = 6 + msgs[i + 1].len;
 			len = msgs[i + 1].len;
-			ret = __az6007_read(d->udev, req, value, index, st->data,
-					       length);
+			ret = __az6007_read(d->udev, req, value, index,
+					    st->data, length);
 			if (ret >= len) {
 				for (j = 0; j < len; j++) {
 					msgs[i + 1].buf[j] = st->data[j + 5];
@@ -391,10 +389,11 @@ static int az6007_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
 			for (j = 0; j < len; j++) {
 				st->data[j] = msgs[i].buf[j + 1];
 				if (dvb_usb_az6007_debug & 2)
-					printk(KERN_CONT "0x%02x ", st->data[j]);
+					printk(KERN_CONT "0x%02x ",
+					       st->data[j]);
 			}
-			ret =  __az6007_write(d->udev, req, value, index, st->data,
-						 length);
+			ret =  __az6007_write(d->udev, req, value, index,
+					      st->data, length);
 		} else {
 			/* read bytes */
 			if (dvb_usb_az6007_debug & 2)
@@ -406,8 +405,8 @@ static int az6007_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
 			value = addr;
 			length = msgs[i].len + 6;
 			len = msgs[i].len;
-			ret = __az6007_read(d->udev, req, value, index, st->data,
-					       length);
+			ret = __az6007_read(d->udev, req, value, index,
+					    st->data, length);
 			for (j = 0; j < len; j++) {
 				msgs[i].buf[j] = st->data[j + 5];
 				if (dvb_usb_az6007_debug & 2)
@@ -466,7 +465,7 @@ int az6007_identify_state(struct usb_device *udev,
 		__az6007_write(udev, 0x00, 0, 0, NULL, 0);
 	}
 
-	deb_info("Device is on %s state\n", *cold? "warm" : "cold");
+	deb_info("Device is on %s state\n", *cold ? "warm" : "cold");
 	return 0;
 }
 
@@ -514,7 +513,7 @@ static struct dvb_usb_device_properties az6007_properties = {
 					}
 				}
 			},
-		}}
+		} }
 	} },
 	.power_ctrl       = az6007_power_ctrl,
 	.read_mac_address = az6007_read_mac_addr,