Commit c02ec71b authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab

[media] em28xx: fix wrong data offset for non-interlaced mode in em28xx_copy_video

em28xx_copy_video uses a wrong offset for the target buffer
when copying the data from an USB isoc packet. This happens
only for the second and all following lines in the packet.
The reason why this bug doesn't cause image corruption with
my test device (SilverCrest Webcam 1.3 MPix) is, that this
device never sends any packets that cross the end of a line.
I don't know if all devices behave like this, so this patch
should be considered for stable.
With the upcoming patches to add support for USB bulk transfers,
em28xx_copy_video will be called once per URB, which will
always trigger this bug.
Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2f5741aa
...@@ -207,15 +207,10 @@ static void em28xx_copy_video(struct em28xx *dev, ...@@ -207,15 +207,10 @@ static void em28xx_copy_video(struct em28xx *dev,
startread = p; startread = p;
remain = len; remain = len;
if (dev->progressive) if (dev->progressive || buf->top_field)
fieldstart = outp;
else {
/* Interlaces two half frames */
if (buf->top_field)
fieldstart = outp; fieldstart = outp;
else else /* interlaced mode, even nr. of lines */
fieldstart = outp + bytesperline; fieldstart = outp + bytesperline;
}
linesdone = dma_q->pos / bytesperline; linesdone = dma_q->pos / bytesperline;
currlinedone = dma_q->pos % bytesperline; currlinedone = dma_q->pos % bytesperline;
...@@ -243,6 +238,9 @@ static void em28xx_copy_video(struct em28xx *dev, ...@@ -243,6 +238,9 @@ static void em28xx_copy_video(struct em28xx *dev,
remain -= lencopy; remain -= lencopy;
while (remain > 0) { while (remain > 0) {
if (dev->progressive)
startwrite += lencopy;
else
startwrite += lencopy + bytesperline; startwrite += lencopy + bytesperline;
startread += lencopy; startread += lencopy;
if (bytesperline > remain) if (bytesperline > remain)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment