From d2a10428418b2fbb82864473fb8db7547269935d Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Sat, 22 Sep 2012 13:46:24 -0300
Subject: [PATCH] --- yaml --- r: 331187 b: refs/heads/master c:
 f6068764573d2f29529c8835126dabe3f2096c1f h: refs/heads/master i:   331185:
 f67aa10c84810fba2b384a7c7f37204269ede6bc   331183:
 9500816f0a69240a519927832a27450a60e5e08b v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/usb/dvb-usb-v2/anysee.c | 8 ++++----
 trunk/drivers/media/usb/dvb-usb-v2/anysee.h | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 536a86213128..31b008ef202c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36f647bad3d35546892c3639328479355da8690d
+refs/heads/master: f6068764573d2f29529c8835126dabe3f2096c1f
diff --git a/trunk/drivers/media/usb/dvb-usb-v2/anysee.c b/trunk/drivers/media/usb/dvb-usb-v2/anysee.c
index 6705d81f0cb2..ec540140c810 100644
--- a/trunk/drivers/media/usb/dvb-usb-v2/anysee.c
+++ b/trunk/drivers/media/usb/dvb-usb-v2/anysee.c
@@ -1217,6 +1217,8 @@ static int anysee_ci_init(struct dvb_usb_device *d)
 	if (ret)
 		return ret;
 
+	state->ci_attached = true;
+
 	return 0;
 }
 
@@ -1225,7 +1227,7 @@ static void anysee_ci_release(struct dvb_usb_device *d)
 	struct anysee_state *state = d_to_priv(d);
 
 	/* detach CI */
-	if (state->has_ci)
+	if (state->ci_attached)
 		dvb_ca_en50221_release(&state->ci);
 
 	return;
@@ -1257,10 +1259,8 @@ static int anysee_init(struct dvb_usb_device *d)
 	/* attach CI */
 	if (state->has_ci) {
 		ret = anysee_ci_init(d);
-		if (ret) {
-			state->has_ci = false;
+		if (ret)
 			return ret;
-		}
 	}
 
 	return 0;
diff --git a/trunk/drivers/media/usb/dvb-usb-v2/anysee.h b/trunk/drivers/media/usb/dvb-usb-v2/anysee.h
index 4ab467679a43..c1a4273f14ff 100644
--- a/trunk/drivers/media/usb/dvb-usb-v2/anysee.h
+++ b/trunk/drivers/media/usb/dvb-usb-v2/anysee.h
@@ -56,6 +56,7 @@ struct anysee_state {
 	u8 seq;
 	u8 fe_id:1; /* frondend ID */
 	u8 has_ci:1;
+	u8 ci_attached:1;
 	struct dvb_ca_en50221 ci;
 	unsigned long ci_cam_ready; /* jiffies */
 };