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

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

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

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (5880): wm8775/wm8739: Fix memory leak when unloading module
  V4L/DVB (5877): radio-gemtek-pci: remove unused structure member
  V4L/DVB (5871): Conexant 2388x: check for kthread_run
  V4L/DVB (5869): Add check for valid control ID to v4l2_ctrl_next.
  V4L/DVB (5867): videodev2.h: add missing <sys/time.h> for userspace
  V4L/DVB (5866): ivtv: fix DMA timeout when capturing VBI + another stream
  V4L/DVB (5865): Remove usage of HZ on ivtv driver, replacing by msecs_to_jiffies
  V4L/DVB (5861): Use msecs_to_jiffies instead of HZ on bttv, cx88 and saa7134
  V4L/DVB (5860): Use msecs_to_jiffies instead of HZ on some webcam drivers
  V4L/DVB (5859): use msecs_to_jiffies on InfraRed RC5 timeout
  V4L/DVB (5858): Use msecs_to_jiffies instead of HZ on media/video I2C drivers
  V4L/DVB (5857): Use msecs_to_jiffies instead of HZ on radio drivers
  V4L/DVB (5855): ivtv: fix Kconfig typo and refer to the driver homepage.
  V4L/DVB (5854): ivtv: cleanup of driver messages
  V4L/DVB (5853): ivtv: add support to suppress high volume i2c debug messages.
  V4L/DVB (5852): ivtv: don't recompile needlessly
  V4L/DVB (5851): ivtv: fix missing I2C_ALGOBIT config option
  V4L/DVB (5850): ivtv: improve API command debugging
  V4L/DVB (5848): Av7110: fix typo
parents eaf729c8 1b2232ab

drivers/media/common/ir-functions.c

+2 −2
Original line number Diff line number Diff line
@@ -345,8 +345,8 @@ void ir_rc5_timer_end(unsigned long data) 
			}



			/* Set/reset key-up timer */

			timeout = current_jiffies + (500 + ir->rc5_key_timeout

						     * HZ) / 1000;

			timeout = current_jiffies +

				  msecs_to_jiffies(ir->rc5_key_timeout);

			mod_timer(&ir->timer_keyup, timeout);



			/* Save code for repeat test */

drivers/media/dvb/ttpci/av7110.c

+1 −1
Original line number Diff line number Diff line
@@ -2267,7 +2267,7 @@ static int frontend_init(struct av7110 *av7110) 
		FE_FUNC_OVERRIDE(av7110->fe->ops.diseqc_send_master_cmd, av7110->fe_diseqc_send_master_cmd, av7110_fe_diseqc_send_master_cmd);

		FE_FUNC_OVERRIDE(av7110->fe->ops.diseqc_send_burst, av7110->fe_diseqc_send_burst, av7110_fe_diseqc_send_burst);

		FE_FUNC_OVERRIDE(av7110->fe->ops.set_tone, av7110->fe_set_tone, av7110_fe_set_tone);

		FE_FUNC_OVERRIDE(av7110->fe->ops.set_voltage, av7110->fe_set_voltage, av7110_fe_set_voltage;)

		FE_FUNC_OVERRIDE(av7110->fe->ops.set_voltage, av7110->fe_set_voltage, av7110_fe_set_voltage);

		FE_FUNC_OVERRIDE(av7110->fe->ops.dishnetwork_send_legacy_command, av7110->fe_dishnetwork_send_legacy_command, av7110_fe_dishnetwork_send_legacy_command);

		FE_FUNC_OVERRIDE(av7110->fe->ops.set_frontend, av7110->fe_set_frontend, av7110_fe_set_frontend);

drivers/media/radio/radio-aimslab.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ struct rt_device 
static void sleep_delay(long n)

{

	/* Sleep nicely for 'n' uS */

	int d=n/(1000000/HZ);

	int d=n/msecs_to_jiffies(1000);

	if(!d)

		udelay(n);

	else

drivers/media/radio/radio-cadet.c

+2 −2
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ cadet_handler(unsigned long data) 
	init_timer(&readtimer);

	readtimer.function=cadet_handler;

	readtimer.data=(unsigned long)0;

	readtimer.expires=jiffies+(HZ/20);

	readtimer.expires=jiffies+msecs_to_jiffies(50);

	add_timer(&readtimer);

}
@@ -349,7 +349,7 @@ cadet_read(struct file *file, char __user *data, size_t count, loff_t *ppos) 
		init_timer(&readtimer);

		readtimer.function=cadet_handler;

		readtimer.data=(unsigned long)0;

		readtimer.expires=jiffies+(HZ/20);

		readtimer.expires=jiffies+msecs_to_jiffies(50);

		add_timer(&readtimer);

	}

	if(rdsin==rdsout) {

drivers/media/radio/radio-gemtek-pci.c

+0 −3
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ struct gemtek_pci_card { 


	u32 iobase;

	u32 length;

	u16 model;



	u32 current_frequency;

	u8  mute;
@@ -413,8 +412,6 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci 
		goto err_pci;

	}



	pci_read_config_word( pci_dev, PCI_SUBSYSTEM_ID, &card->model );



	pci_set_drvdata( pci_dev, card );



	if ( (devradio = kmalloc( sizeof( struct video_device ), GFP_KERNEL )) == NULL ) {