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

Commit ea9e7b55 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (6820): s5h1409: QAM SNR related fixes
  V4L/DVB (6819): i2c: fix drivers/media/video/bt866.c
  V4L/DVB (6814): Makefile: always enter video/
  V4L/DVB (6798): saa7134: enable LNA in analog mode for Hauppauge WinTV HVR-1110
  V4L/DVB (6803): buf-core.c locking fixes
parents 980110c5 2300317f

drivers/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ 
#



obj-y := common/

obj-$(CONFIG_VIDEO_DEV) += video/

obj-y += video/

obj-$(CONFIG_VIDEO_DEV) += radio/

obj-$(CONFIG_DVB_CORE)  += dvb/

drivers/media/dvb/frontends/s5h1409.c

+8 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static struct vsb_snr_tab { 
	u16	val;

	u16	data;

} vsb_snr_tab[] = {

	{ 1023, 770, },

	{  924, 300, },

	{  923, 300, },

	{  918, 295, },

	{  915, 290, },
@@ -154,6 +154,7 @@ static struct qam64_snr_tab { 
	u16	val;

	u16	data;

} qam64_snr_tab[] = {

	{    1,   0, },

	{   12, 300, },

	{   15, 290, },

	{   18, 280, },
@@ -217,6 +218,7 @@ static struct qam64_snr_tab { 
	{   95, 202, },

	{   96, 201, },

	{  104, 200, },

	{  255,   0, },

};



/* QAM256 SNR lookup table */
@@ -224,6 +226,7 @@ static struct qam256_snr_tab { 
	u16	val;

	u16	data;

} qam256_snr_tab[] = {

	{    1,   0, },

	{   12, 400, },

	{   13, 390, },

	{   15, 380, },
@@ -292,6 +295,7 @@ static struct qam256_snr_tab { 
	{  105, 262, },

	{  106, 261, },

	{  110, 260, },

	{  255,   0, },

};



/* 8 bit registers, 16 bit values */
@@ -670,14 +674,15 @@ static int s5h1409_read_snr(struct dvb_frontend* fe, u16* snr) 
	u16 reg;

	dprintk("%s()\n", __FUNCTION__);



	reg = s5h1409_readreg(state, 0xf1) & 0x1ff;



	switch(state->current_modulation) {

	case QAM_64:

		reg = s5h1409_readreg(state, 0xf0) & 0xff;

		return s5h1409_qam64_lookup_snr(fe, snr, reg);

	case QAM_256:

		reg = s5h1409_readreg(state, 0xf0) & 0xff;

		return s5h1409_qam256_lookup_snr(fe, snr, reg);

	case VSB_8:

		reg = s5h1409_readreg(state, 0xf1) & 0x3ff;

		return s5h1409_vsb_lookup_snr(fe, snr, reg);

	default:

		break;

drivers/media/video/bt866.c

+0 −1
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ static struct i2c_client bt866_client_tmpl = 
	.addr = 0,

	.adapter = NULL,

	.driver = &i2c_driver_bt866,

	.usage_count = 0

};



static int bt866_found_proc(struct i2c_adapter *adapter,

drivers/media/video/saa7134/saa7134-cards.c

+1 −0
Original line number Diff line number Diff line
@@ -3221,6 +3221,7 @@ struct saa7134_board saa7134_boards[] = { 
		.radio_type     = UNSET,

		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tuner_config   = 1,

		.mpeg           = SAA7134_MPEG_DVB,

		.inputs         = {{

			.name = name_tv,

drivers/media/video/videobuf-core.c

+2 −2
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q, 
	if (q->streaming)

		goto done;

	if (!q->reading) {

		retval = videobuf_read_start(q);

		retval = __videobuf_read_start(q);

		if (retval < 0)

			goto done;

	}
@@ -982,7 +982,7 @@ unsigned int videobuf_poll_stream(struct file *file, 
					 struct videobuf_buffer, stream);

	} else {

		if (!q->reading)

			videobuf_read_start(q);

			__videobuf_read_start(q);

		if (!q->reading) {

			rc = POLLERR;

		} else if (NULL == q->read_buf) {