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

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

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (4818): Flexcop-usb: fix debug printk
  V4L/DVB (4817): Fix uses of "&&" where "&" was intended
  V4L/DVB (4816): Change tuner type for Avermedia A16AR
  V4L/DVB (4815): Remote support for Avermedia A16AR
  V4L/DVB (4814): Remote support for Avermedia 777
  V4L/DVB (4804): Fix missing i2c dependency for saa7110
  V4L/DVB (4802): Cx88: fix remote control on WinFast 2000XP Expert
  V4L/DVB (4795): Tda826x: use correct max frequency
parents 239fd459 6f36fbb2

drivers/media/dvb/b2c2/flexcop-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int flexcop_usb_i2c_req(struct flexcop_usb *fc_usb, 
	wIndex = (chipaddr << 8 ) | addr;



	deb_i2c("i2c %2d: %02x %02x %02x %02x %02x %02x\n",func,request_type,req,

			((wValue && 0xff) << 8),wValue >> 8,((wIndex && 0xff) << 8),wIndex >> 8);

		wValue & 0xff, wValue >> 8, wIndex & 0xff, wIndex >> 8);



	len = usb_control_msg(fc_usb->udev,pipe,

			req,

drivers/media/dvb/frontends/tda826x.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static struct dvb_tuner_ops tda826x_tuner_ops = { 
	.info = {

		.name = "Philips TDA826X",

		.frequency_min = 950000,

		.frequency_min = 2175000

		.frequency_max = 2175000

	},

	.release = tda826x_release,

	.sleep = tda826x_sleep,

drivers/media/video/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ config VIDEO_KS0127 


config VIDEO_SAA7110

	tristate "Philips SAA7110 video decoder"

	depends on VIDEO_V4L1

	depends on VIDEO_V4L1 && I2C

	---help---

	  Support for the Philips SAA7110 video decoders.

drivers/media/video/bt8xx/bttv-cards.c

+1 −1
Original line number Diff line number Diff line
@@ -4001,7 +4001,7 @@ static void __devinit init_PXC200(struct bttv *btv) 
 *      - sleep 1ms

 *      - write 0x0E

 *     read from GPIO_DATA into buf (uint_32)

 *      - if ( buf>>18 & 0x01 ) || ( buf>>19 && 0x01 != 0 )

 *      - if ( buf>>18 & 0x01 ) || ( buf>>19 & 0x01 != 0 )

 *                error. ERROR_CPLD_Check_Failed.

 */

/* ----------------------------------------------------------------------- */

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

+8 −2
Original line number Diff line number Diff line
@@ -202,13 +202,19 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) 
		ir->sampling = 1;

		break;

	case CX88_BOARD_WINFAST_DTV2000H:

	case CX88_BOARD_WINFAST2000XP_EXPERT:

		ir_codes = ir_codes_winfast;

		ir->gpio_addr = MO_GP0_IO;

		ir->mask_keycode = 0x8f8;

		ir->mask_keyup = 0x100;

		ir->polling = 50; /* ms */

		break;

	case CX88_BOARD_WINFAST2000XP_EXPERT:

		ir_codes = ir_codes_winfast;

		ir->gpio_addr = MO_GP0_IO;

		ir->mask_keycode = 0x8f8;

		ir->mask_keyup = 0x100;

		ir->polling = 1; /* ms */

		break;

	case CX88_BOARD_IODATA_GVBCTV7E:

		ir_codes = ir_codes_iodata_bctv7e;

		ir->gpio_addr = MO_GP0_IO;