diff options
author | Henrik Kurelid <henrik@kurelid.se> | 2008-12-04 16:40:52 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-02-24 08:51:28 -0500 |
commit | 096edfbf167ab277608d26ba8b7978da116a4996 (patch) | |
tree | 46aaf081b22a7b9a588f8908187d35c24993c11b /drivers/media | |
parent | 8ae83cdf3297d7da301af36bdb6ff45bd331c6d0 (diff) |
firedtv: fix returned struct for ca_info
The SystemId of the ca_info message was filled with garbage.
It now returns what the card returns.
Signed-off-by: Henrik Kurelid <henrik@kurelid.se>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/firesat/avc_api.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/firesat/avc_api.c b/drivers/media/dvb/firesat/avc_api.c index 56911f3df7f6..3a4da73f0798 100644 --- a/drivers/media/dvb/firesat/avc_api.c +++ b/drivers/media/dvb/firesat/avc_api.c | |||
@@ -763,7 +763,7 @@ int avc_ca_info(struct firesat *firesat, char *app_info, unsigned int *len) | |||
763 | { | 763 | { |
764 | AVCCmdFrm CmdFrm; | 764 | AVCCmdFrm CmdFrm; |
765 | AVCRspFrm RspFrm; | 765 | AVCRspFrm RspFrm; |
766 | /* int pos; FIXME: unused */ | 766 | int pos; |
767 | 767 | ||
768 | memset(&CmdFrm, 0, sizeof(AVCCmdFrm)); | 768 | memset(&CmdFrm, 0, sizeof(AVCCmdFrm)); |
769 | CmdFrm.cts = AVC; | 769 | CmdFrm.cts = AVC; |
@@ -783,13 +783,13 @@ int avc_ca_info(struct firesat *firesat, char *app_info, unsigned int *len) | |||
783 | if (avc_write(firesat, &CmdFrm, &RspFrm) < 0) | 783 | if (avc_write(firesat, &CmdFrm, &RspFrm) < 0) |
784 | return -EIO; | 784 | return -EIO; |
785 | 785 | ||
786 | /* pos = get_ca_object_pos(&RspFrm); FIXME: unused */ | 786 | pos = get_ca_object_pos(&RspFrm); |
787 | app_info[0] = (TAG_CA_INFO >> 16) & 0xFF; | 787 | app_info[0] = (TAG_CA_INFO >> 16) & 0xFF; |
788 | app_info[1] = (TAG_CA_INFO >> 8) & 0xFF; | 788 | app_info[1] = (TAG_CA_INFO >> 8) & 0xFF; |
789 | app_info[2] = (TAG_CA_INFO >> 0) & 0xFF; | 789 | app_info[2] = (TAG_CA_INFO >> 0) & 0xFF; |
790 | app_info[3] = 2; | 790 | app_info[3] = 2; |
791 | app_info[4] = app_info[5]; | 791 | app_info[4] = RspFrm.operand[pos + 0]; |
792 | app_info[5] = app_info[6]; | 792 | app_info[5] = RspFrm.operand[pos + 1]; |
793 | *len = app_info[3] + 4; | 793 | *len = app_info[3] + 4; |
794 | 794 | ||
795 | return 0; | 795 | return 0; |