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

Commit 1cfef5ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (4290): Add support for the TCL M2523_3DB_E tuner.
  V4L/DVB (4289): Missing statement in drivers/media/dvb/frontends/cx22700.c
  V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2
  V4L/DVB (4287): Pvrusb2/: possible cleanups
  V4L/DVB (4285): Cx88: add support for Geniatech Digistar / Digiwave 103g
  V4L/DVB (4284): Cx24123: fix set_voltage function according to the specs
  V4L/DVB (4282): Fix: use swzigzag for swalgo
  V4L/DVB (4281): TDA9887_SET_CONFIG should only be handled by the tda9887.
  V4L/DVB (4277): Fix CI interface on PRO KNC1 cards
  V4L/DVB (4276): Fix CI on old KNC1 DVBC cards
  V4L/DVB (4275): The FE_SET_FRONTEND_TUNE_MODE ioctl always returns EOPNOTSUPP
  V4L/DVB (4274): Eliminate use of tda9887 from pvrusb2 driver
  V4L/DVB (4273): Always log pvrusb2 device register / unregister events
  V4L/DVB (4272): Fix tveeprom supported standards
  V4L/DVB (4270): Add tda9887-specific tuner configuration
  V4L/DVB (4269): Subject: videocodec: make 1-bit fields unsigned
  V4L/DVB (4267): Remove all instances of request_module("tda9887")
  V4L/DVB (4264): Cx88-blackbird: implement VIDIOC_QUERYCTRL and VIDIOC_QUERYMENU
parents 3e8d6ad9 00819f87

Documentation/video4linux/CARDLIST.cx88

+1 −0
Original line number Diff line number Diff line
@@ -50,3 +50,4 @@ 
 49 -> PixelView PlayTV P7000                              [1554:4813]

 50 -> NPG Tech Real TV FM Top 10                          [14f1:0842]

 51 -> WinFast DTV2000 H                                   [107d:665e]

 52 -> Geniatech DVB-S                                     [14f1:0084]

drivers/media/dvb/dvb-core/dvb_frontend.c

+3 −1
Original line number Diff line number Diff line
@@ -570,7 +570,8 @@ static int dvb_frontend_thread(void *data) 
					dvb_frontend_add_event(fe, s);

					fepriv->status = s;

				}

			}

			} else

				dvb_frontend_swzigzag(fe);

		} else

			dvb_frontend_swzigzag(fe);

	}
@@ -975,6 +976,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file, 


	case FE_SET_FRONTEND_TUNE_MODE:

		fepriv->tune_mode_flags = (unsigned long) parg;

		err = 0;

		break;

	};

drivers/media/dvb/frontends/cx22700.c

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet 
		return -EINVAL;



	if (p->code_rate_LP < FEC_1_2 || p->code_rate_LP > FEC_7_8)

		return -EINVAL;



	if (p->code_rate_HP == FEC_4_5 || p->code_rate_LP == FEC_4_5)

		return -EINVAL;

drivers/media/dvb/frontends/cx24123.c

+2 −2
Original line number Diff line number Diff line
@@ -670,10 +670,10 @@ static int cx24123_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage 
	switch (voltage) {

	case SEC_VOLTAGE_13:

		dprintk("%s: setting voltage 13V\n", __FUNCTION__);

		return cx24123_writereg(state, 0x29, val | 0x80);

		return cx24123_writereg(state, 0x29, val & 0x7f);

	case SEC_VOLTAGE_18:

		dprintk("%s: setting voltage 18V\n", __FUNCTION__);

		return cx24123_writereg(state, 0x29, val & 0x7f);

		return cx24123_writereg(state, 0x29, val | 0x80);

	default:

		return -EINVAL;

	};

drivers/media/dvb/ttpci/budget-av.c

+10 −5
Original line number Diff line number Diff line
@@ -1141,6 +1141,15 @@ static void frontend_init(struct budget_av *budget_av) 
		break;



	case SUBID_DVBC_KNC1:

		budget_av->reinitialise_demod = 1;

		fe = tda10021_attach(&philips_cu1216_config,

				     &budget_av->budget.i2c_adap,

				     read_pwm(budget_av));

		if (fe) {

			fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;

		}

		break;



	case SUBID_DVBC_KNC1_PLUS:

	case SUBID_DVBC_CINERGY1200:

		budget_av->reinitialise_demod = 1;
@@ -1293,11 +1302,7 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio 


	budget_av->budget.dvb_adapter.priv = budget_av;

	frontend_init(budget_av);



	if (!budget_av->has_saa7113) {

	ciintf_init(budget_av);

	}



	return 0;

}