From d9783a234ccc6662a7237d20ef6174b0c69829f5 Mon Sep 17 00:00:00 2001
From: Henrik Kurelid <henrik@kurelid.se>
Date: Thu, 4 Dec 2008 22:40:52 +0100
Subject: [PATCH] --- yaml --- r: 131729 b: refs/heads/master c:
 096edfbf167ab277608d26ba8b7978da116a4996 h: refs/heads/master i:   131727:
 39c82b46c42283de70bbfa813fe837d865cae3de v: v3

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

diff --git a/[refs] b/[refs]
index 8fe0230126f4..983e6d4f09d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae83cdf3297d7da301af36bdb6ff45bd331c6d0
+refs/heads/master: 096edfbf167ab277608d26ba8b7978da116a4996
diff --git a/trunk/drivers/media/dvb/firesat/avc_api.c b/trunk/drivers/media/dvb/firesat/avc_api.c
index 56911f3df7f6..3a4da73f0798 100644
--- a/trunk/drivers/media/dvb/firesat/avc_api.c
+++ b/trunk/drivers/media/dvb/firesat/avc_api.c
@@ -763,7 +763,7 @@ int avc_ca_info(struct firesat *firesat, char *app_info, unsigned int *len)
 {
 	AVCCmdFrm CmdFrm;
 	AVCRspFrm RspFrm;
-	/* int pos;  FIXME: unused */
+	int pos;
 
 	memset(&CmdFrm, 0, sizeof(AVCCmdFrm));
 	CmdFrm.cts = AVC;
@@ -783,13 +783,13 @@ int avc_ca_info(struct firesat *firesat, char *app_info, unsigned int *len)
 	if (avc_write(firesat, &CmdFrm, &RspFrm) < 0)
 		return -EIO;
 
-	/* pos = get_ca_object_pos(&RspFrm);  FIXME: unused */
+	pos = get_ca_object_pos(&RspFrm);
 	app_info[0] = (TAG_CA_INFO >> 16) & 0xFF;
 	app_info[1] = (TAG_CA_INFO >> 8) & 0xFF;
 	app_info[2] = (TAG_CA_INFO >> 0) & 0xFF;
 	app_info[3] = 2;
-	app_info[4] = app_info[5];
-	app_info[5] = app_info[6];
+	app_info[4] = RspFrm.operand[pos + 0];
+	app_info[5] = RspFrm.operand[pos + 1];
 	*len = app_info[3] + 4;
 
 	return 0;