commit 41b42a7bc6f219851ee6465e15c972944ad48e49
author Linux Build Service Account <lnxbuild@localhost> Sun May 19 04:38:02 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun May 19 04:38:02 2013 -0700
tree 0eaec94809fa9cde18eab9ead073165efb686dcb
parent be55ae99a356bb9e5d8e1ff2841eca6b2b489028
parent 1c287d786d98f187105fbfc1925bee342549a74e

Merge "media: dvb: Fix handling of incomplete TS packets from DVR"

drivers/media/dvb/dvb-core/dvb_demux.c

diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c
index 8caa9dd..b8c3c44 100644
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -1577,9 +1577,11 @@
 
 		if (pktsize == 192) {
 			if (leadingbytes)
-				memcpy(timestamp, &buf[p], TIMESTAMP_LEN);
+				memcpy(timestamp, &demux->tsbuf[p],
+					TIMESTAMP_LEN);
 			else
-				memcpy(timestamp, &buf[188], TIMESTAMP_LEN);
+				memcpy(timestamp, &demux->tsbuf[188],
+					TIMESTAMP_LEN);
 		} else {
 			memset(timestamp, 0, TIMESTAMP_LEN);
 		}