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

Commit 54a772b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  [media] tuner-core: fix a 2.6.39 regression with mt20xx
  [media] dvb_frontend: fix race condition in stopping/starting frontend
  [media] media: fix radio-sf16fmr2 build when SND is not enabled
  [media] MEDIA: Fix non-ISA_DMA_API link failure of sound code
  [media] nuvoton-cir: make idle timeout more sane
  [media] mceusb: increase default timeout to 100ms
  [media] mceusb: Timeout unit corrections
  [media] Revert "V4L/DVB: cx23885: Enable Message Signaled Interrupts(MSI)"
parents a6b52a9d a1ad5ec7

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

+8 −0
Original line number Diff line number Diff line
@@ -1988,6 +1988,14 @@ static int dvb_frontend_open(struct inode *inode, struct file *file) 
	if (dvbdev->users == -1 && fe->ops.ts_bus_ctrl) {

		if ((ret = fe->ops.ts_bus_ctrl(fe, 1)) < 0)

			goto err0;



		/* If we took control of the bus, we need to force

		   reinitialization.  This is because many ts_bus_ctrl()

		   functions strobe the RESET pin on the demod, and if the

		   frontend thread already exists then the dvb_init() routine

		   won't get called (which is what usually does initial

		   register configuration). */

		fepriv->reinitialise = 1;

	}



	if ((ret = dvb_generic_open (inode, file)) < 0)

drivers/media/radio/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ config RADIO_MAXIRADIO 


config RADIO_MIROPCM20

	tristate "miroSOUND PCM20 radio"

	depends on ISA && VIDEO_V4L2 && SND

	depends on ISA && ISA_DMA_API && VIDEO_V4L2 && SND

	select SND_ISA

	select SND_MIRO

	---help---
@@ -201,7 +201,7 @@ config RADIO_SF16FMI 


config RADIO_SF16FMR2

	tristate "SF16FMR2 Radio"

	depends on ISA && VIDEO_V4L2

	depends on ISA && VIDEO_V4L2 && SND

	---help---

	  Choose Y here if you have one of these FM radio cards.

drivers/media/rc/mceusb.c

+5 −4
Original line number Diff line number Diff line
@@ -558,9 +558,10 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf, 
				 inout, data1);

			break;

		case MCE_CMD_S_TIMEOUT:

			/* value is in units of 50us, so x*50/100 or x/2 ms */

			/* value is in units of 50us, so x*50/1000 ms */

			dev_info(dev, "%s receive timeout of %d ms\n",

				 inout, ((data1 << 8) | data2) / 2);

				 inout,

				 ((data1 << 8) | data2) * MCE_TIME_UNIT / 1000);

			break;

		case MCE_CMD_G_TIMEOUT:

			dev_info(dev, "Get receive timeout\n");
@@ -847,7 +848,7 @@ static void mceusb_handle_command(struct mceusb_dev *ir, int index) 
	switch (ir->buf_in[index]) {

	/* 2-byte return value commands */

	case MCE_CMD_S_TIMEOUT:

		ir->rc->timeout = US_TO_NS((hi << 8 | lo) / 2);

		ir->rc->timeout = US_TO_NS((hi << 8 | lo) * MCE_TIME_UNIT);

		break;



	/* 1-byte return value commands */
@@ -1078,7 +1079,7 @@ static struct rc_dev *mceusb_init_rc_dev(struct mceusb_dev *ir) 
	rc->priv = ir;

	rc->driver_type = RC_DRIVER_IR_RAW;

	rc->allowed_protos = RC_TYPE_ALL;

	rc->timeout = US_TO_NS(1000);

	rc->timeout = MS_TO_NS(100);

	if (!ir->flags.no_tx) {

		rc->s_tx_mask = mceusb_set_tx_mask;

		rc->s_tx_carrier = mceusb_set_tx_carrier;

drivers/media/rc/nuvoton-cir.c

+1 −1
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id) 
	rdev->dev.parent = &pdev->dev;

	rdev->driver_name = NVT_DRIVER_NAME;

	rdev->map_name = RC_MAP_RC6_MCE;

	rdev->timeout = US_TO_NS(1000);

	rdev->timeout = MS_TO_NS(100);

	/* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */

	rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD);

#if 0

drivers/media/video/cx23885/cx23885-core.c

+2 −7
Original line number Diff line number Diff line
@@ -2060,10 +2060,6 @@ static int __devinit cx23885_initdev(struct pci_dev *pci_dev, 
		goto fail_irq;

	}



	if (!pci_enable_msi(pci_dev))

		err = request_irq(pci_dev->irq, cx23885_irq,

				  IRQF_DISABLED, dev->name, dev);

	else

	err = request_irq(pci_dev->irq, cx23885_irq,

			  IRQF_SHARED | IRQF_DISABLED, dev->name, dev);

	if (err < 0) {
@@ -2114,7 +2110,6 @@ static void __devexit cx23885_finidev(struct pci_dev *pci_dev) 


	/* unregister stuff */

	free_irq(pci_dev->irq, dev);

	pci_disable_msi(pci_dev);



	cx23885_dev_unregister(dev);

	v4l2_device_unregister(v4l2_dev);