aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorRaymond Mantchala <raymond.mantchala@streamvision.ft>2005-11-08 21:35:17 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:02 -0800
commit93a14f15d35cd60742220995d3413d256ebde9ee (patch)
treeda6fa97a552b21835d747c3e2a6d05cb69141b17 /drivers/media/dvb
parent2b70a2f55e249308c57879df5723d96406e12b27 (diff)
[PATCH] dvb: dst: ASN.1 length field Fix
ASN.1 length field Fix Signed-off-by: Raymond Mantchala <raymond.mantchala@streamvision.ft> Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Cc: Johannes Stezenbach <js@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/bt8xx/dst_ca.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index 6776a592045..8a8a3333cb8 100644
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -328,7 +328,8 @@ u32 asn_1_decode(u8 *asn_1_array)
} else {
word_count = length_field & 0x7f;
for (count = 0; count < word_count; count++) {
- length = (length | asn_1_array[count + 1]) << 8;
+ length = length << 8;
+ length += asn_1_array[count + 1];
dprintk(verbose, DST_CA_DEBUG, 1, " Length=[%04x]", length);
}
}