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

Commit 8488e408 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:
 - Some regression fixes at the audio part for devices with
   cx23885/cx25840
 - A DMA corruption fix at cx231xx
 - two fixes at the winbond IR driver
 - Several fixes for the EXYNOS media driver (s5p)
 - two fixes at the OMAP3 preview driver
 - one fix at the dvb core failure path
 - an include missing (slab.h) at smiapp-core causing compilation
   breakage
 - em28xx was not loading the IR driver driver anymore.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (31 commits)
  [media] Revert "[media] V4L: JPEG class documentation corrections"
  [media] s5p-fimc: Add missing FIMC-LITE file operations locking
  [media] omap3isp: preview: Fix contrast and brightness handling
  [media] omap3isp: preview: Fix output size computation depending on input format
  [media] winbond-cir: Initialise timeout, driver_type and allowed_protos
  [media] winbond-cir: Fix txandrx module info
  [media] cx23885: Silence unknown command warnings
  [media] cx23885: add support for HVR-1255 analog (cx23888 variant)
  [media] cx23885: make analog support work for HVR_1250 (cx23885 variant)
  [media] cx25840: fix vsrc/hsrc usage on cx23888 designs
  [media] cx25840: fix regression in HVR-1800 analog audio
  [media] cx25840: fix regression in analog support hue/saturation controls
  [media] cx25840: fix regression in HVR-1800 analog support
  [media] s5p-mfc: Fixed setup of custom controls in decoder and encoder
  [media] cx231xx: don't DMA to random addresses
  [media] em28xx: fix em28xx-rc load
  [media] dvb-core: Release semaphore on error path dvb_register_device()
  [media] s5p-fimc: Stop media entity pipeline if fimc_pipeline_validate fails
  [media] s5p-fimc: Fix compiler warning in fimc-lite.c
  [media] s5p-fimc: media_entity_pipeline_start() may fail
  ...
parents 2c913900 ec3ed85f

Documentation/DocBook/media/v4l/controls.xml

+1 −1
Original line number Diff line number Diff line
@@ -3988,7 +3988,7 @@ interface and may change in the future.</para> 
	    from RGB to Y'CbCr color space.

	    </entry>

	  </row>

	  <row id = "v4l2-jpeg-chroma-subsampling">

	  <row>

	    <entrytbl spanname="descr" cols="2">

	      <tbody valign="top">

		<row>

Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml

+0 −7
Original line number Diff line number Diff line
@@ -284,13 +284,6 @@ These controls are described in <xref 
	    processing controls. These controls are described in <xref

	    linkend="image-process-controls" />.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CTRL_CLASS_JPEG</constant></entry>

	    <entry>0x9d0000</entry>

	    <entry>The class containing JPEG compression controls.

These controls are described in <xref

		linkend="jpeg-controls" />.</entry>

	  </row>

	</tbody>

      </tgroup>

    </table>

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

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, 
	if (minor == MAX_DVB_MINORS) {

		kfree(dvbdevfops);

		kfree(dvbdev);

		up_write(&minor_rwsem);

		mutex_unlock(&dvbdev_register_lock);

		return -EINVAL;

	}

drivers/media/rc/winbond-cir.c

+3 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ MODULE_PARM_DESC(invert, "Invert the signal from the IR receiver"); 


static bool txandrx; /* default = 0 */

module_param(txandrx, bool, 0444);

MODULE_PARM_DESC(invert, "Allow simultaneous TX and RX");

MODULE_PARM_DESC(txandrx, "Allow simultaneous TX and RX");



static unsigned int wake_sc = 0x800F040C;

module_param(wake_sc, uint, 0644);
@@ -1032,6 +1032,8 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id) 
	data->dev->tx_ir = wbcir_tx;

	data->dev->priv = data;

	data->dev->dev.parent = &device->dev;

	data->dev->timeout = MS_TO_NS(100);

	data->dev->allowed_protos = RC_TYPE_ALL;



	if (!request_region(data->wbase, WAKEUP_IOMEM_LEN, DRVNAME)) {

		dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",

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

+2 −2
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev) 
		urb->context = dev;

		urb->pipe = usb_rcvisocpipe(dev->udev,

						dev->adev.end_point_addr);

		urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;

		urb->transfer_flags = URB_ISO_ASAP;

		urb->transfer_buffer = dev->adev.transfer_buffer[i];

		urb->interval = 1;

		urb->complete = cx231xx_audio_isocirq;
@@ -368,7 +368,7 @@ static int cx231xx_init_audio_bulk(struct cx231xx *dev) 
		urb->context = dev;

		urb->pipe = usb_rcvbulkpipe(dev->udev,

						dev->adev.end_point_addr);

		urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;

		urb->transfer_flags = 0;

		urb->transfer_buffer = dev->adev.transfer_buffer[i];

		urb->complete = cx231xx_audio_bulkirq;

		urb->transfer_buffer_length = sb_size;