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

Commit 7b43b473 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media updates from Mauro Carvalho Chehab:
 "A series of fixup patches for version 4.0:

   - one VB2 core fixup, when stopping the stream;
   - one VB2 core fixup for dma-contig memory type;
   - driver fixes at rtl28xx, s5p (tv, jpeg, mfc, soc-camera, sh_veu,
     cx23885, gspca"

* tag 'media/v3.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] rtl28xxu: return success for unimplemented FE callback
  [media] rtl2832: disable regmap register cache
  [media] vb2: Fix dma_dir setting for dma-contig mem type
  [media] media: s5p-mfc: fix broken pointer cast on 64bit arch
  [media] media: s5p-mfc: fix mmap support for 64bit arch
  [media] cx23885: fix querycap
  [media] sh_veu: v4l2_dev wasn't set
  [media] s5p-mfc: Fix NULL pointer dereference caused by not set q->lock
  [media] s5p-jpeg: exynos3250: fix erroneous reset procedure
  [media] s5p-tv: hdmi needs I2C support
  [media] s5p-jpeg: Initialize cb and cr to zero
  [media] media: fix gspca drivers build dependencies
  [media] soc-camera: Fix devm_kfree() in soc_of_bind()
  [media] media: atmel-isi: increase the burst length to improve the performance
  [media] vb2: fix 'UNBALANCED' warnings when calling vb2_thread_stop()
parents f22e6e84 b18042a6

drivers/media/dvb-frontends/rtl2832.c

+1 −1
Original line number Diff line number Diff line
@@ -1240,7 +1240,7 @@ static int rtl2832_probe(struct i2c_client *client, 
	dev->regmap_config.max_register = 5 * 0x100,

	dev->regmap_config.ranges = regmap_range_cfg,

	dev->regmap_config.num_ranges = ARRAY_SIZE(regmap_range_cfg),

	dev->regmap_config.cache_type = REGCACHE_RBTREE,

	dev->regmap_config.cache_type = REGCACHE_NONE,

	dev->regmap = regmap_init(&client->dev, &regmap_bus, client,

				  &dev->regmap_config);

	if (IS_ERR(dev->regmap)) {

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

+6 −7
Original line number Diff line number Diff line
@@ -1339,14 +1339,13 @@ static int vidioc_querycap(struct file *file, void *priv, 
	strlcpy(cap->driver, dev->name, sizeof(cap->driver));

	strlcpy(cap->card, cx23885_boards[tsport->dev->board].name,

		sizeof(cap->card));

	sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));

	cap->capabilities =

		V4L2_CAP_VIDEO_CAPTURE |

		V4L2_CAP_READWRITE     |

		V4L2_CAP_STREAMING     |

		0;

	sprintf(cap->bus_info, "PCIe:%s", pci_name(dev->pci));

	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |

			   V4L2_CAP_STREAMING;

	if (dev->tuner_type != TUNER_ABSENT)

		cap->capabilities |= V4L2_CAP_TUNER;

		cap->device_caps |= V4L2_CAP_TUNER;

	cap->capabilities = cap->device_caps | V4L2_CAP_VBI_CAPTURE |

		V4L2_CAP_AUDIO | V4L2_CAP_DEVICE_CAPS;



	return 0;

}

drivers/media/platform/s5p-jpeg/jpeg-core.c

+3 −0
Original line number Diff line number Diff line
@@ -1845,6 +1845,9 @@ static void exynos4_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx) 
	struct s5p_jpeg_addr jpeg_addr;

	u32 pix_size, padding_bytes = 0;



	jpeg_addr.cb = 0;

	jpeg_addr.cr = 0;



	pix_size = ctx->cap_q.w * ctx->cap_q.h;



	if (ctx->mode == S5P_JPEG_ENCODE) {

drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


void exynos3250_jpeg_reset(void __iomem *regs)

{

	u32 reg = 0;

	u32 reg = 1;

	int count = 1000;



	writel(1, regs + EXYNOS3250_SW_RESET);

drivers/media/platform/s5p-mfc/s5p_mfc.c

+1 −0
Original line number Diff line number Diff line
@@ -833,6 +833,7 @@ static int s5p_mfc_open(struct file *file) 
	q->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;

	q->io_modes = VB2_MMAP;

	q->drv_priv = &ctx->fh;

	q->lock = &dev->mfc_mutex;

	if (vdev == dev->vfd_dec) {

		q->io_modes = VB2_MMAP;

		q->ops = get_dec_queue_ops();