From: Raymond Mantchala <raymond.mantchala@streamvision.ft>
Date: Wed, 9 Nov 2005 05:35:17 +0000 (-0800)
Subject: [PATCH] dvb: dst: ASN.1 length field Fix
X-Git-Tag: v2.6.15-rc1~348
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93a14f15d35cd60742220995d3413d256ebde9ee;p=linux-2.6

[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>
---

diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index 6776a59204..8a8a3333cb 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);
 		}
 	}