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

This project is archived. Its data is read-only.

Commit 4945b8a5 authored Dec 29, 2006 by Linus Torvalds

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: (28 commits)
  V4L/DVB (5010): Cx88: Fix leadtek_eeprom tagging
  V4L/DVB (5012): Usbvision fix: It was using "&&" instead "&"
  V4L/DVB (5001): Add two required headers on kernel 2.6.20-rc1
  V4L/DVB (5014): Allyesconfig build fixes on some non x86 arch
  V4L/DVB (4997): Bttv: delete duplicated ioremap()
  V4L/DVB (4996): Msp3400: fix kthread_run error check
  V4L/DVB (4995): Vivi: fix kthread_run() error check
  V4L/DVB (4994): Vivi: fix use after free in list_for_each()
  V4L/DVB (4992): Fix typo in saa7134-dvb.c
  V4L/DVB (4991): Cafe_ccic.c: fix NULL dereference
  V4L/DVB (4990): Cpia2/cpia2_usb.c: fix error-path leak
  V4L/DVB (4988): Cx2341x audio_properties is an u16, not u8
  V4L/DVB (4984): LOG_STATUS should show the real temporal filter value.
  V4L/DVB (4983): Force temporal filter to 0 when scaling to prevent ghosting.
  V4L/DVB (4982): Fix broken audio mode handling for line-in in msp3400.
  V4L/DVB (4980): Fixes bug 7267: PAL/60 is not working
  V4L/DVB (4979): Fixes compilation when CONFIG_V4L1_COMPAT is not selected
  V4L/DVB (4973): Dvb-core: fix printk type warning
  V4L/DVB (4972): Dvb-core: fix bug in CRC-32 checking on 64-bit systems
  V4L/DVB (4970): Usbvision memory fixes
  ...

parents 6c722e90 69f7e75a

drivers/media/common/ir-functions.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@
	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/moduleparam.h>		#include <linux/moduleparam.h>
	#include <linux/string.h>		#include <linux/string.h>
			#include <linux/jiffies.h>
	#include <media/ir-common.h>		#include <media/ir-common.h>

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

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -605,7 +605,7 @@ static void dvb_net_ule( struct net_device dev, const u8 buf, size_t buf_len )
	{ &utype, sizeof utype },		{ &utype, sizeof utype },
	{ priv->ule_skb->data, priv->ule_skb->len - 4 }		{ priv->ule_skb->data, priv->ule_skb->len - 4 }
	};		};
	unsigned long ule_crc = ~0L, expected_crc;		u32 ule_crc = ~0L, expected_crc;
	if (priv->ule_dbit) {		if (priv->ule_dbit) {
	/* Set D-bit for CRC32 verification,		/* Set D-bit for CRC32 verification,
	* if it was set originally. */		* if it was set originally. */
	@@ -618,7 +618,7 @@ static void dvb_net_ule( struct net_device dev, const u8 buf, size_t buf_len )
	((u8 )priv->ule_skb->tail - 2) << 8 \|		((u8 )priv->ule_skb->tail - 2) << 8 \|
	((u8 )priv->ule_skb->tail - 1);		((u8 )priv->ule_skb->tail - 1);
	if (ule_crc != expected_crc) {		if (ule_crc != expected_crc) {
	printk(KERN_WARNING "%lu: CRC32 check FAILED: %#lx / %#lx, SNDU len %d type %#x, ts_remain %d, next 2: %x.\n",		printk(KERN_WARNING "%lu: CRC32 check FAILED: %08x / %08x, SNDU len %d type %#x, ts_remain %d, next 2: %x.\n",
	priv->ts_count, ule_crc, expected_crc, priv->ule_sndu_len, priv->ule_sndu_type, ts_remain, ts_remain > 2 ? (unsigned short )from_where : 0);		priv->ts_count, ule_crc, expected_crc, priv->ule_sndu_len, priv->ule_sndu_type, ts_remain, ts_remain > 2 ? (unsigned short )from_where : 0);

	#ifdef ULE_DEBUG		#ifdef ULE_DEBUG

drivers/media/dvb/dvb-usb/nova-t-usb2.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -90,9 +90,11 @@ static int nova_t_rc_query(struct dvb_usb_device d, u32 event, int *state)
	deb_rc("raw key code 0x%02x, 0x%02x, 0x%02x to c: %02x d: %02x toggle: %d\n",key[1],key[2],key[3],custom,data,toggle);		deb_rc("raw key code 0x%02x, 0x%02x, 0x%02x to c: %02x d: %02x toggle: %d\n",key[1],key[2],key[3],custom,data,toggle);

	for (i = 0; i < ARRAY_SIZE(haupp_rc_keys); i++) {		for (i = 0; i < ARRAY_SIZE(haupp_rc_keys); i++) {
	deb_rc("c: %x, d: %x\n",haupp_rc_keys[i].data,haupp_rc_keys[i].custom);
	if (haupp_rc_keys[i].data == data &&		if (haupp_rc_keys[i].data == data &&
	haupp_rc_keys[i].custom == custom) {		haupp_rc_keys[i].custom == custom) {

			deb_rc("c: %x, d: %x\n",haupp_rc_keys[i].data,haupp_rc_keys[i].custom);

	*event = haupp_rc_keys[i].event;		*event = haupp_rc_keys[i].event;
	*state = REMOTE_KEY_PRESSED;		*state = REMOTE_KEY_PRESSED;
	if (st->old_toggle == toggle) {		if (st->old_toggle == toggle) {

drivers/media/dvb/frontends/dib3000mc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -515,7 +515,7 @@ static int dib3000mc_autosearch_start(struct dvb_frontend *demod, struct dibx000
	fchan.vit_alpha = 1; fchan.vit_code_rate_hp = 2; fchan.vit_code_rate_lp = 2;		fchan.vit_alpha = 1; fchan.vit_code_rate_hp = 2; fchan.vit_code_rate_lp = 2;
	fchan.vit_hrch = 0; fchan.vit_select_hp = 1;		fchan.vit_hrch = 0; fchan.vit_select_hp = 1;

	dib3000mc_set_channel_cfg(state, &fchan, 7);		dib3000mc_set_channel_cfg(state, &fchan, 11);

	reg = dib3000mc_read_word(state, 0);		reg = dib3000mc_read_word(state, 0);
	dib3000mc_write_word(state, 0, reg \| (1 << 8));		dib3000mc_write_word(state, 0, reg \| (1 << 8));

drivers/media/video/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -668,7 +668,7 @@ config VIDEO_M32R_AR_M64278

	config VIDEO_CAFE_CCIC		config VIDEO_CAFE_CCIC
	tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"		tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
	depends on I2C && VIDEO_V4L2		depends on PCI && I2C && VIDEO_V4L2
	select VIDEO_OV7670		select VIDEO_OV7670
	---help---		---help---
	This is a video4linux2 driver for the Marvell 88ALP01 integrated		This is a video4linux2 driver for the Marvell 88ALP01 integrated