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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (5023): Fix compilation on ppc32 architecture
  V4L/DVB (5071): Tveeprom: autodetect LG TAPC G701D as tuner type 37
  V4L/DVB (5069): Fix bttv and friends on 64bit machines with lots of memory
  V4L/DVB (5033): MSI TV@nywhere Plus fixes
  V4L/DVB (5029): Ks0127 status flags
  V4L/DVB (5024): Fix quickcam communicator driver for big endian architectures
  V4L/DVB (5021): Cx88xx: Fix lockup on suspend
  V4L/DVB (5020): Fix: disable interrupts while at KM_BOUNCE_READ
  V4L/DVB (5019): Fix the frame->grabstate update in read() entry point.
parents e55cec4f 412297d3

drivers/media/video/cx88/cx88-tvaudio.c

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/errno.h>

#include <linux/freezer.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/mm.h>
@@ -961,6 +962,7 @@ int cx88_audio_thread(void *data) 
		msleep_interruptible(1000);

		if (kthread_should_stop())

			break;

		try_to_freeze();



		/* just monitor the audio status for now ... */

		memset(&t, 0, sizeof(t));

drivers/media/video/ks0127.c

+4 −4
Original line number Diff line number Diff line
@@ -712,13 +712,13 @@ static int ks0127_command(struct i2c_client *client, 
		*iarg = 0;

		status = ks0127_read(ks, KS_STAT);

		if (!(status & 0x20))		 /* NOVID not set */

			*iarg = (*iarg & DECODER_STATUS_GOOD);

			*iarg = (*iarg | DECODER_STATUS_GOOD);

		if ((status & 0x01))		      /* CLOCK set */

			*iarg = (*iarg & DECODER_STATUS_COLOR);

			*iarg = (*iarg | DECODER_STATUS_COLOR);

		if ((status & 0x08))		   /* PALDET set */

			*iarg = (*iarg & DECODER_STATUS_PAL);

			*iarg = (*iarg | DECODER_STATUS_PAL);

		else

			*iarg = (*iarg & DECODER_STATUS_NTSC);

			*iarg = (*iarg | DECODER_STATUS_NTSC);

		break;



	//Catch any unknown command

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

+10 −4
Original line number Diff line number Diff line
@@ -2570,6 +2570,7 @@ struct saa7134_board saa7134_boards[] = { 
		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.gpiomask       = 1 << 21,

		.inputs = {{

			.name   = name_tv,

			.vmux   = 1,
@@ -2578,15 +2579,20 @@ struct saa7134_board saa7134_boards[] = { 
		},{

			.name   = name_comp1,

			.vmux   = 3,

			.amux   = LINE1,

			.amux   = LINE2,	/* unconfirmed, taken from Philips driver */

		},{

			.name   = name_comp2,

			.vmux   = 0,		/* untested, Composite over S-Video */

			.amux   = LINE2,

		},{

			.name   = name_svideo,

			.vmux   = 0,

			.amux   = LINE1,

			.vmux   = 8,

			.amux   = LINE2,

		}},

		.radio = {

			.name   = name_radio,

			.amux   = LINE1,

			.amux   = TV,

			.gpio   = 0x0200000,

		},

	},

	[SAA7134_BOARD_CINERGY250PCI] = {

drivers/media/video/tveeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ hauppauge_tuner[] = 
	{ TUNER_ABSENT,        "Thompson DTT757"},

	/* 80-89 */

	{ TUNER_ABSENT,        "Philips FQ1216LME MK3"},

	{ TUNER_ABSENT,        "LG TAPC G701D"},

	{ TUNER_LG_PAL_NEW_TAPC, "LG TAPC G701D"},

	{ TUNER_LG_NTSC_NEW_TAPC, "LG TAPC H791F"},

	{ TUNER_LG_PAL_NEW_TAPC, "TCL 2002MB 3"},

	{ TUNER_LG_PAL_NEW_TAPC, "TCL 2002MI 3"},

drivers/media/video/usbvideo/quickcam_messenger.h

+0 −14
Original line number Diff line number Diff line
@@ -35,27 +35,13 @@ struct rgb { 
};



struct bayL0 {

#ifdef __BIG_ENDIAN

	u8 r;

	u8 g;

#elif __LITTLE_ENDIAN

	u8 g;

	u8 r;

#else

#error not byte order defined

#endif

};



struct bayL1 {

#ifdef __BIG_ENDIAN

	u8 g;

	u8 b;

#elif __LITTLE_ENDIAN

	u8 b;

	u8 g;

#else

#error not byte order defined

#endif

};



struct cam_size {