Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3e30f63 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] stk1160: fix sequence handling 



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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 98006636

drivers/media/usb/stk1160/stk1160-v4l.c

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ static int stk1160_start_streaming(struct stk1160 *dev) 
	/* Start saa711x */

	v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 1);



	dev->sequence = 0;



	/* Start stk1160 */

	stk1160_write_reg(dev, STK1160_DCTRL, 0xb3);

	stk1160_write_reg(dev, STK1160_DCTRL+3, 0x00);

drivers/media/usb/stk1160/stk1160-video.c

+1 −3
Original line number Diff line number Diff line
@@ -96,9 +96,7 @@ void stk1160_buffer_done(struct stk1160 *dev) 
{

	struct stk1160_buffer *buf = dev->isoc_ctl.buf;



	dev->field_count++;



	buf->vb.v4l2_buf.sequence = dev->field_count >> 1;

	buf->vb.v4l2_buf.sequence = dev->sequence++;

	buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED;

	buf->vb.v4l2_buf.bytesused = buf->bytesused;

	v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);

drivers/media/usb/stk1160/stk1160.h

+1 −2
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ struct stk1160 { 
	v4l2_std_id norm;	  /* current norm */

	struct stk1160_fmt *fmt;  /* selected format */



	unsigned int field_count; /* not sure ??? */

	enum v4l2_field field;    /* also not sure :/ */

	unsigned int sequence;



	/* i2c i/o */

	struct i2c_adapter i2c_adap;