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

Commit f7e87a44 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 "A series of driver fixes:
   - a few compilation fixes with randconfigs
   - one potential compilation breakage on userspace due to the usage of
     a gcc extension
   - several warnings fixed
   - some other random driver fixes"

* tag 'media/v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (22 commits)
  [media] s5p-jpeg: Avoid -Wuninitialized warning in s5p_jpeg_parse_hdr
  [media] s5p-fimc: Only build suspend/resume for PM
  [media] s5p-jpeg: Only build suspend/resume for PM
  [media] Remove references to non-existent PLAT_S5P symbol
  [media] videobuf-dma-contig: set vm_pgoff to be zero to pass the sanity check in vm_iomap_memory()
  [media] tw68: remove bogus I2C_ALGOBIT dependency
  [media] usbvision-video: two use after frees
  [media] tw68: remove deprecated IRQF_DISABLED
  [media] xc5000: use after free in release()
  [media] em28xx-input: NULL dereference on error
  [media] wl128x: fix fmdbg compiler warning
  Revert "[media] v4l2-dv-timings: fix a sparse warning"
  [media] hackrf: harmless off by one in debug code
  [media] cx23885: initialize config structs for T9580
  [media] v4l: uvcvideo: Fix buffer completion size check
  [media] vivid: fix buffer overrun
  [media] saa7146: Create a device name before it's used
  [media] em28xx: fix uninitialized variable warning
  [media] vivid: fix Kconfig FB dependency
  [media] anysee: make sure loading modules is const
  ...
parents ebbe914b f3d83a10

Documentation/DocBook/media/v4l/compat.xml

+4 −0
Original line number Diff line number Diff line
@@ -2566,6 +2566,10 @@ fields changed from _s32 to _u32. 
	  <para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;.

	  </para>

        </listitem>

      </orderedlist>

    </section>



    <section>

      <title>V4L2 in Linux 3.18</title>

      <orderedlist>

	<listitem>

drivers/media/common/saa7146/saa7146_core.c

+3 −3
Original line number Diff line number Diff line
@@ -364,6 +364,9 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent 
		goto out;

	}



	/* create a nice device name */

	sprintf(dev->name, "saa7146 (%d)", saa7146_num);



	DEB_EE("pci:%p\n", pci);



	err = pci_enable_device(pci);
@@ -438,9 +441,6 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent 


	/* the rest + print status message */



	/* create a nice device name */

	sprintf(dev->name, "saa7146 (%d)", saa7146_num);



	pr_info("found saa7146 @ mem %p (revision %d, irq %d) (0x%04x,0x%04x)\n",

		dev->mem, dev->revision, pci->irq,

		pci->subsystem_vendor, pci->subsystem_device);

drivers/media/pci/cx23885/cx23885-dvb.c

+3 −0
Original line number Diff line number Diff line
@@ -1600,6 +1600,7 @@ static int dvb_register(struct cx23885_tsport *port) 
				break;



			/* attach tuner */

			memset(&m88ts2022_config, 0, sizeof(m88ts2022_config));

			m88ts2022_config.fe = fe0->dvb.frontend;

			m88ts2022_config.clock = 27000000;

			memset(&info, 0, sizeof(struct i2c_board_info));
@@ -1635,6 +1636,7 @@ static int dvb_register(struct cx23885_tsport *port) 
		/* port c - terrestrial/cable */

		case 2:

			/* attach frontend */

			memset(&si2168_config, 0, sizeof(si2168_config));

			si2168_config.i2c_adapter = &adapter;

			si2168_config.fe = &fe0->dvb.frontend;

			si2168_config.ts_mode = SI2168_TS_SERIAL;
@@ -1654,6 +1656,7 @@ static int dvb_register(struct cx23885_tsport *port) 
			port->i2c_client_demod = client_demod;



			/* attach tuner */

			memset(&si2157_config, 0, sizeof(si2157_config));

			si2157_config.fe = fe0->dvb.frontend;

			memset(&info, 0, sizeof(struct i2c_board_info));

			strlcpy(info.type, "si2157", I2C_NAME_SIZE);

drivers/media/pci/tw68/Kconfig

+0 −1
Original line number Diff line number Diff line 
config VIDEO_TW68

	tristate "Techwell tw68x Video For Linux"

	depends on VIDEO_DEV && PCI && VIDEO_V4L2

	select I2C_ALGOBIT

	select VIDEOBUF2_DMA_SG

	---help---

	  Support for Techwell tw68xx based frame grabber boards.

drivers/media/pci/tw68/tw68-core.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static int tw68_initdev(struct pci_dev *pci_dev, 


	/* get irq */

	err = devm_request_irq(&pci_dev->dev, pci_dev->irq, tw68_irq,

			  IRQF_SHARED | IRQF_DISABLED, dev->name, dev);

			  IRQF_SHARED, dev->name, dev);

	if (err < 0) {

		pr_err("%s: can't get IRQ %d\n",

		       dev->name, pci_dev->irq);