From c9fe8a379ac55814c417db1f0f4b0663313311d4 Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Fri, 18 Mar 2011 19:36:42 -0300
Subject: [PATCH] --- yaml --- r: 242091 b: refs/heads/master c:
 1e8750c2ac2bcbf2b084d3fa77cbb5eef33b3e7f h: refs/heads/master i:   242089:
 1435cf490be794d6a32401f2e136777dfd5afa8a   242087:
 c42ccf62b7b3b92c2d792a60bbf4902334c521ee v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/dvb/dvb-usb/af9015.c | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 151b438a699a..d132100069e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1e13971b19324305b35fafc080b527465214d3c
+refs/heads/master: 1e8750c2ac2bcbf2b084d3fa77cbb5eef33b3e7f
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9015.c b/trunk/drivers/media/dvb/dvb-usb/af9015.c
index 6457d042b1a0..da2f87efe071 100644
--- a/trunk/drivers/media/dvb/dvb-usb/af9015.c
+++ b/trunk/drivers/media/dvb/dvb-usb/af9015.c
@@ -479,9 +479,7 @@ static int af9015_init_endpoint(struct dvb_usb_device *d)
 		ret = af9015_set_reg_bit(d, 0xd50b, 0);
 	else
 		ret = af9015_clear_reg_bit(d, 0xd50b, 0);
-	if (ret)
-		goto error;
-	ret = af9015_write_reg(d, 0x98e9, 0xff);
+
 error:
 	if (ret)
 		err("endpoint init failed:%d", ret);
@@ -614,6 +612,11 @@ static int af9015_init(struct dvb_usb_device *d)
 	int ret;
 	deb_info("%s:\n", __func__);
 
+	/* init RC canary */
+	ret = af9015_write_reg(d, 0x98e9, 0xff);
+	if (ret)
+		goto error;
+
 	ret = af9015_init_endpoint(d);
 	if (ret)
 		goto error;
@@ -1041,11 +1044,14 @@ static int af9015_rc_query(struct dvb_usb_device *d)
 
 	/* Only process key if canary killed */
 	if (buf[16] != 0xff && buf[0] != 0x01) {
-		/* Reset the canary */
-		af9015_write_reg(d, 0x98e9, 0xff);
 		deb_rc("%s: key pressed %02x %02x %02x %02x\n", __func__,
 			buf[12], buf[13], buf[14], buf[15]);
 
+		/* Reset the canary */
+		ret = af9015_write_reg(d, 0x98e9, 0xff);
+		if (ret)
+			goto error;
+
 		/* Remember this key */
 		memcpy(priv->rc_last, &buf[12], 4);
 		if (buf[14] == (u8) ~buf[15]) {
@@ -1058,6 +1064,7 @@ static int af9015_rc_query(struct dvb_usb_device *d)
 					buf[13] << 8 | buf[14];
 			}
 		} else {
+			/* 32 bit NEC */
 			priv->rc_keycode = buf[12] << 24 | buf[13] << 16 |
 					buf[14] << 8 | buf[15];
 		}