From cedeb9c6740be19bf83ab093e680eb49f7d1b101 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 2 May 2010 17:14:33 -0300
Subject: [PATCH] --- yaml --- r: 193068 b: refs/heads/master c:
 801dd3b32d2a09a883d0cf182eb6956945e5a429 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/tm6000/tm6000-video.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 588ba90e3026..43af09dbeb54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4b727b3ae0cc244f803a8a0c532df06ad846a1b
+refs/heads/master: 801dd3b32d2a09a883d0cf182eb6956945e5a429
diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c
index edc59424d260..bed758fe4c32 100644
--- a/trunk/drivers/staging/tm6000/tm6000-video.c
+++ b/trunk/drivers/staging/tm6000/tm6000-video.c
@@ -360,13 +360,13 @@ static int copy_streams(u8 *data, u8 *out_p, unsigned long len,
 					dev->isoc_ctl.tmp_buf_len--;
 				}
 				if (dev->isoc_ctl.tmp_buf_len) {
-					memcpy (&header,p,
+					memcpy(&header, p,
 						dev->isoc_ctl.tmp_buf_len);
-					memcpy (((u8 *)header)+
-						dev->isoc_ctl.tmp_buf,
+					memcpy((u8 *)&header +
+						dev->isoc_ctl.tmp_buf_len,
 						ptr,
-						4-dev->isoc_ctl.tmp_buf_len);
-					ptr+=4-dev->isoc_ctl.tmp_buf_len;
+						4 - dev->isoc_ctl.tmp_buf_len);
+					ptr += 4 - dev->isoc_ctl.tmp_buf_len;
 					goto HEADER;
 				}
 			}