From 1ed9b9b0c32010f13c0eeb80ea05862980e0d839 Mon Sep 17 00:00:00 2001 From: Stefan Ringel Date: Fri, 7 May 2010 12:29:04 -0300 Subject: [PATCH] --- yaml --- r: 193163 b: refs/heads/master c: 3c7c5e9e8903f201bdbc85bdffba47a2d1352e4c h: refs/heads/master i: 193161: 04a683c6b60b9998f8095fdc360ee9e57536fc65 193159: 5afba2e741a4ece9651201dcc74dc9f97f8d45da v: v3 --- [refs] | 2 +- trunk/drivers/staging/tm6000/tm6000-video.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fb9a47c2037e..fcc4518ac088 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 083e472176999de97848e5659cc958516ef81ecb +refs/heads/master: 3c7c5e9e8903f201bdbc85bdffba47a2d1352e4c diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c index 721d5a52948c..7828030c4f33 100644 --- a/trunk/drivers/staging/tm6000/tm6000-video.c +++ b/trunk/drivers/staging/tm6000/tm6000-video.c @@ -225,8 +225,8 @@ static int copy_packet(struct urb *urb, u32 header, u8 **ptr, u8 *endp, * It should, instead, check if the user selected * entrelaced or non-entrelaced mode */ - pos= ((line<<1)+field)*linewidth + - block*TM6000_URB_MSG_LEN; + pos = ((line << 1) - field - 1) * linewidth + + block * TM6000_URB_MSG_LEN; /* Don't allow to write out of the buffer */ if (pos+TM6000_URB_MSG_LEN > (*buf)->vb.size) {