Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 23:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] stk1160: fix sequence handling

Browse Source 
Fix the sequence counter: we're counting frames, not fields.

Also remove the unused 'field' field. That would only be needed if this driver
would support V4L2_FIELD_ALTERNATE.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-06-08 06:53:59 -03:00 committed by Mauro Carvalho Chehab
parent 98006636b0
commit e3e30f6338
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/usb/stk1160/stk1160-v4l.c
View File

@ -194,6 +194,8 @@ static int stk1160_start_streaming(struct stk1160 *dev)
/* Start saa711x */ /* Start saa711x */
v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 1); v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 1);
dev->sequence = 0;
/* Start stk1160 */ /* Start stk1160 */
stk1160_write_reg(dev, STK1160_DCTRL, 0xb3); stk1160_write_reg(dev, STK1160_DCTRL, 0xb3);
stk1160_write_reg(dev, STK1160_DCTRL+3, 0x00); stk1160_write_reg(dev, STK1160_DCTRL+3, 0x00);

4
drivers/media/usb/stk1160/stk1160-video.c
View File

@ -96,9 +96,7 @@ void stk1160_buffer_done(struct stk1160 *dev)
{ {
struct stk1160_buffer *buf = dev->isoc_ctl.buf; struct stk1160_buffer *buf = dev->isoc_ctl.buf;
dev->field_count++; buf->vb.v4l2_buf.sequence = dev->sequence++;
buf->vb.v4l2_buf.sequence = dev->field_count >> 1;
buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED; buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED;
buf->vb.v4l2_buf.bytesused = buf->bytesused; buf->vb.v4l2_buf.bytesused = buf->bytesused;
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);

3
drivers/media/usb/stk1160/stk1160.h
View File

@ -151,8 +151,7 @@ struct stk1160 {
v4l2_std_id norm; /* current norm */ v4l2_std_id norm; /* current norm */
struct stk1160_fmt *fmt; /* selected format */ struct stk1160_fmt *fmt; /* selected format */
unsigned int field_count; /* not sure ??? */ unsigned int sequence;
enum v4l2_field field; /* also not sure :/ */
/* i2c i/o */ /* i2c i/o */
struct i2c_adapter i2c_adap; struct i2c_adapter i2c_adap;