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

Commit 417a9ef1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'v4l_for_2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  V4L/DVB: pxa_camera: move fifo reset direct before dma start
  V4L/DVB: video: testing unsigned for less than 0
  V4L/DVB: mx1-camera: compile fix
  V4L/DVB: budget: Oops: "BUG: unable to handle kernel NULL pointer 	dereference"
  V4L/DVB: ngene: Workaround for stuck DiSEqC pin
  V4L/DVB: saa7146: fix regression of the av7110/budget-av driver
  V4L/DVB: v4l: fix config dependencies: mxb and saa7191 are V4L2 drivers, not V4L1
  V4L/DVB: feature-removal: announce videotext.h removal
  V4L/DVB: V4L - vpfe capture - fix for kernel crash
  V4L/DVB: gspca: make usb id 0461:0815 get handled by the right driver
  V4L/DVB: gspca - stv06xx: Remove the 046d:08da from the stv06xx driver
  V4L/DVB: gspca - sn9c20x: Correct onstack wait_queue_head declaration
  V4L/DVB: saa7146: fix up bytesperline if it is an impossible value
  V4L/DVB: V4L: vpfe_capture - free ccdc_lock when memory allocation fails
  V4L/DVB: V4L - Makfile:Removed duplicate entry of davinci
  V4L/DVB: omap24xxcam: potential buffer overflow
parents 91bc482e a47f6be4

Documentation/feature-removal-schedule.txt

+23 −0
Original line number Diff line number Diff line
@@ -589,3 +589,26 @@ Why: Useful in 2003, implementation is a hack. 
	Generally invoked by accident today.

	Seen as doing more harm than good.

Who:	Len Brown <len.brown@intel.com>



----------------------------



What:	video4linux /dev/vtx teletext API support

When:	2.6.35

Files:	drivers/media/video/saa5246a.c drivers/media/video/saa5249.c

	include/linux/videotext.h

Why:	The vtx device nodes have been superseded by vbi device nodes

	for many years. No applications exist that use the vtx support.

	Of the two i2c drivers that actually support this API the saa5249

	has been impossible to use for a year now and no known hardware

	that supports this device exists. The saa5246a is theoretically

	supported by the old mxb boards, but it never actually worked.



	In summary: there is no hardware that can use this API and there

	are no applications actually implementing this API.



	The vtx support still reserves minors 192-223 and we would really

	like to reuse those for upcoming new functionality. In the unlikely

	event that new hardware appears that wants to use the functionality

	provided by the vtx API, then that functionality should be build

	around the sliced VBI API instead.

Who:	Hans Verkuil <hverkuil@xs4all.nl>

arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h

+7 −1
Original line number Diff line number Diff line
@@ -31,7 +31,13 @@ 
#define DMA_MODE_WRITE		1

#define DMA_MODE_MASK		1



#define DMA_BASE IO_ADDRESS(DMA_BASE_ADDR)

#define MX1_DMA_REG(offset)	MX1_IO_ADDRESS(MX1_DMA_BASE_ADDR + (offset))



/* DMA Interrupt Mask Register */

#define MX1_DMA_DIMR		MX1_DMA_REG(0x08)



/* Channel Control Register */

#define MX1_DMA_CCR(x)		MX1_DMA_REG(0x8c + ((x) << 6))



#define IMX_DMA_MEMSIZE_32	(0 << 4)

#define IMX_DMA_MEMSIZE_8	(1 << 4)

drivers/media/common/saa7146_fops.c

+5 −6
Original line number Diff line number Diff line
@@ -423,15 +423,14 @@ static void vv_callback(struct saa7146_dev *dev, unsigned long status) 
	}

}



int saa7146_vv_devinit(struct saa7146_dev *dev)

{

	return v4l2_device_register(&dev->pci->dev, &dev->v4l2_dev);

}

EXPORT_SYMBOL_GPL(saa7146_vv_devinit);



int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)

{

	struct saa7146_vv *vv;

	int err;



	err = v4l2_device_register(&dev->pci->dev, &dev->v4l2_dev);

	if (err)

		return err;



	vv = kzalloc(sizeof(struct saa7146_vv), GFP_KERNEL);

	if (vv == NULL) {

drivers/media/common/saa7146_video.c

+5 −3
Original line number Diff line number Diff line
@@ -558,9 +558,11 @@ static int vidioc_s_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *f 
	/* ok, accept it */

	vv->ov_fb = *fb;

	vv->ov_fmt = fmt;

	if (0 == vv->ov_fb.fmt.bytesperline)

		vv->ov_fb.fmt.bytesperline =

			vv->ov_fb.fmt.width * fmt->depth / 8;



	if (vv->ov_fb.fmt.bytesperline < vv->ov_fb.fmt.width) {

		vv->ov_fb.fmt.bytesperline = vv->ov_fb.fmt.width * fmt->depth / 8;

		DEB_D(("setting bytesperline to %d\n", vv->ov_fb.fmt.bytesperline));

	}



	mutex_unlock(&dev->lock);

	return 0;

drivers/media/dvb/frontends/stv090x.c

+4 −0
Original line number Diff line number Diff line
@@ -4470,6 +4470,10 @@ static int stv090x_setup(struct dvb_frontend *fe) 
	if (stv090x_write_reg(state, STV090x_TSTRES0, 0x00) < 0)

		goto err;



	/* workaround for stuck DiSEqC output */

	if (config->diseqc_envelope_mode)

		stv090x_send_diseqc_burst(fe, SEC_MINI_A);



	return 0;

err:

	dprintk(FE_ERROR, 1, "I/O error");