Commit b6255ee3 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-media 

Pull media fixes from Mauro Carvalho Chehab:
 "For a some fix patches for v3.4, including a regression fix at DVB core"

Fix up trivial conflicts in Documentation/feature-removal-schedule.txt

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] gspca - sonixj: Fix a zero divide in isoc interrupt
  [media] media: videobuf2-dma-contig: include header for exported symbols
  [media] media: videobuf2-dma-contig: quiet sparse noise about plain integer as NULL pointer
  [media] media: vb2-memops: Export vb2_get_vma symbol
  [media] s5p-fimc: Correct memory allocation for VIDIOC_CREATE_BUFS
  [media] s5p-fimc: Fix locking in subdev set_crop op
  [media] dvb_frontend: fix a regression with DVB-S zig-zag
  [media] fintek-cir: change || to &&
  [media] V4L: Schedule V4L2_CID_HCENTER, V4L2_CID_VCENTER controls for removal
  [media] rc: Postpone ISR registration
  [media] marvell-cam: fix an ARM build error
  [media] V4L: soc-camera: protect hosts during probing from overzealous user-space
parents d69c5c2c 788ab1bb

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Diff line number Diff line
@@ -539,3 +539,13 @@ When: 3.6 
Why:	setitimer is not returning -EFAULT if user pointer is NULL. This

	violates the spec.

Who:	Sasikantha Babu <sasikanth.v19@gmail.com>



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



What:	V4L2_CID_HCENTER, V4L2_CID_VCENTER V4L2 controls

When:	3.7

Why:	The V4L2_CID_VCENTER, V4L2_CID_HCENTER controls have been deprecated

	for about 4 years and they are not used by any mainline driver.

	There are newer controls (V4L2_CID_PAN*, V4L2_CID_TILT*) that provide

	similar	functionality.

Who:	Sylwester Nawrocki <sylvester.nawrocki@gmail.com>

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

+4 −0
Original line number Diff line number Diff line
@@ -1921,6 +1921,10 @@ static int dtv_set_frontend(struct dvb_frontend *fe) 
	} else {

		/* default values */

		switch (c->delivery_system) {

		case SYS_DVBS:

		case SYS_DVBS2:

		case SYS_ISDBS:

		case SYS_TURBO:

		case SYS_DVBC_ANNEX_A:

		case SYS_DVBC_ANNEX_C:

			fepriv->min_delay = HZ / 20;

drivers/media/rc/ene_ir.c

+16 −16
Original line number Diff line number Diff line
@@ -1018,22 +1018,6 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id) 


	spin_lock_init(&dev->hw_lock);



	/* claim the resources */

	error = -EBUSY;

	dev->hw_io = pnp_port_start(pnp_dev, 0);

	if (!request_region(dev->hw_io, ENE_IO_SIZE, ENE_DRIVER_NAME)) {

		dev->hw_io = -1;

		dev->irq = -1;

		goto error;

	}



	dev->irq = pnp_irq(pnp_dev, 0);

	if (request_irq(dev->irq, ene_isr,

			IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev)) {

		dev->irq = -1;

		goto error;

	}



	pnp_set_drvdata(pnp_dev, dev);

	dev->pnp_dev = pnp_dev;
@@ -1086,6 +1070,22 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id) 
	device_set_wakeup_capable(&pnp_dev->dev, true);

	device_set_wakeup_enable(&pnp_dev->dev, true);



	/* claim the resources */

	error = -EBUSY;

	dev->hw_io = pnp_port_start(pnp_dev, 0);

	if (!request_region(dev->hw_io, ENE_IO_SIZE, ENE_DRIVER_NAME)) {

		dev->hw_io = -1;

		dev->irq = -1;

		goto error;

	}



	dev->irq = pnp_irq(pnp_dev, 0);

	if (request_irq(dev->irq, ene_isr,

			IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev)) {

		dev->irq = -1;

		goto error;

	}



	error = rc_register_device(rdev);

	if (error < 0)

		goto error;

drivers/media/rc/fintek-cir.c

+11 −11
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int fintek_hw_detect(struct fintek_dev *fintek) 
	/*

	 * Newer reviews of this chipset uses port 8 instead of 5

	 */

	if ((chip != 0x0408) || (chip != 0x0804))

	if ((chip != 0x0408) && (chip != 0x0804))

		fintek->logical_dev_cir = LOGICAL_DEV_CIR_REV2;

	else

		fintek->logical_dev_cir = LOGICAL_DEV_CIR_REV1;
@@ -514,16 +514,6 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id 


	spin_lock_init(&fintek->fintek_lock);



	ret = -EBUSY;

	/* now claim resources */

	if (!request_region(fintek->cir_addr,

			    fintek->cir_port_len, FINTEK_DRIVER_NAME))

		goto failure;



	if (request_irq(fintek->cir_irq, fintek_cir_isr, IRQF_SHARED,

			FINTEK_DRIVER_NAME, (void *)fintek))

		goto failure;



	pnp_set_drvdata(pdev, fintek);

	fintek->pdev = pdev;
@@ -558,6 +548,16 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id 
	/* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */

	rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD);



	ret = -EBUSY;

	/* now claim resources */

	if (!request_region(fintek->cir_addr,

			    fintek->cir_port_len, FINTEK_DRIVER_NAME))

		goto failure;



	if (request_irq(fintek->cir_irq, fintek_cir_isr, IRQF_SHARED,

			FINTEK_DRIVER_NAME, (void *)fintek))

		goto failure;



	ret = rc_register_device(rdev);

	if (ret)

		goto failure;

drivers/media/rc/ite-cir.c

+10 −10
Original line number Diff line number Diff line
@@ -1515,16 +1515,6 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id 
	/* initialize raw event */

	init_ir_raw_event(&itdev->rawir);



	ret = -EBUSY;

	/* now claim resources */

	if (!request_region(itdev->cir_addr,

				dev_desc->io_region_size, ITE_DRIVER_NAME))

		goto failure;



	if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,

			ITE_DRIVER_NAME, (void *)itdev))

		goto failure;



	/* set driver data into the pnp device */

	pnp_set_drvdata(pdev, itdev);

	itdev->pdev = pdev;
@@ -1600,6 +1590,16 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id 
	rdev->driver_name = ITE_DRIVER_NAME;

	rdev->map_name = RC_MAP_RC6_MCE;



	ret = -EBUSY;

	/* now claim resources */

	if (!request_region(itdev->cir_addr,

				dev_desc->io_region_size, ITE_DRIVER_NAME))

		goto failure;



	if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,

			ITE_DRIVER_NAME, (void *)itdev))

		goto failure;



	ret = rc_register_device(rdev);

	if (ret)

		goto failure;

CRA Git | Maintained and supported by SUSTech CRA and CCSE