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

Commit c22cff08 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] soc-camera: Compile fixes for mx2-camera
  [media] SoC Camera: ov6650: minor cleanups
  [media] SOC Camera: OMAP1: typo fix
  [media] SoC Camera: OMAP1: update for recent videobuf changes
  [media] SoC Camera: OMAP1: update for recent framework changes
  [media] ARM mx3_camera: check for DMA engine type
  [media] tm6000: bugfix set tv standards
  [media] cafe_ccic: fix subdev configuration
  [media] saa7134: Fix autodetect for Behold A7 and H7 TV cards
  [media] v4l: kill the BKL
  [media] BZ#22292: dibx000_common: Restore i2c algo pointer
parents 6b4e81db 6b101926

drivers/media/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ comment "Multimedia core support" 


config VIDEO_DEV

	tristate "Video For Linux"

	depends on BKL # used in many drivers for ioctl handling, need to kill

	---help---

	  V4L core support for video capture and overlay devices, webcams and

	  AM/FM radio cards.

drivers/media/dvb/frontends/dibx000_common.c

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ static int i2c_adapter_init(struct i2c_adapter *i2c_adap, 
			    struct dibx000_i2c_master *mst)

{

	strncpy(i2c_adap->name, name, sizeof(i2c_adap->name));

	i2c_adap->algo = algo;

	i2c_adap->algo_data = NULL;

	i2c_set_adapdata(i2c_adap, mst);

	if (i2c_add_adapter(i2c_adap) < 0)

drivers/media/video/cafe_ccic.c

+3 −2
Original line number Diff line number Diff line
@@ -2065,8 +2065,9 @@ static int cafe_pci_probe(struct pci_dev *pdev, 
		sensor_cfg.clock_speed = 45;



	cam->sensor_addr = 0x42;

	cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, &cam->i2c_adapter,

			NULL, "ov7670", cam->sensor_addr, NULL);

	cam->sensor = v4l2_i2c_new_subdev_cfg(&cam->v4l2_dev, &cam->i2c_adapter,

			"ov7670", "ov7670", 0, &sensor_cfg, cam->sensor_addr,

			NULL);

	if (cam->sensor == NULL) {

		ret = -ENODEV;

		goto out_smbus;

drivers/media/video/cx231xx/cx231xx-417.c

+2 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/delay.h>

#include <linux/device.h>

#include <linux/firmware.h>

#include <linux/smp_lock.h>

#include <linux/vmalloc.h>

#include <media/v4l2-common.h>

#include <media/v4l2-ioctl.h>
@@ -1927,10 +1926,9 @@ static int mpeg_open(struct file *file) 
			dev = h;

	}



	if (dev == NULL) {

		unlock_kernel();

	if (dev == NULL)

		return -ENODEV;

	}



	mutex_lock(&dev->lock);



	/* allocate + initialize per filehandle data */

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

+1 −8
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/delay.h>

#include <linux/device.h>

#include <linux/firmware.h>

#include <linux/smp_lock.h>

#include <linux/slab.h>

#include <media/v4l2-common.h>

#include <media/v4l2-ioctl.h>
@@ -1576,12 +1575,8 @@ static int mpeg_open(struct file *file) 


	/* allocate + initialize per filehandle data */

	fh = kzalloc(sizeof(*fh), GFP_KERNEL);

	if (NULL == fh) {

		unlock_kernel();

	if (!fh)

		return -ENOMEM;

	}



	lock_kernel();



	file->private_data = fh;

	fh->dev      = dev;
@@ -1592,8 +1587,6 @@ static int mpeg_open(struct file *file) 
			    V4L2_FIELD_INTERLACED,

			    sizeof(struct cx23885_buffer),

			    fh, NULL);

	unlock_kernel();



	return 0;

}