Two patches

GIT PULL Hans Verkuil 1 participant 1 message Oct 27, 2014 Media (V4L/DVB)

lore

Share & tools

lore

Hans Verkuil

author

2014-10-27 10:34 UTC #0 lore raw

Hi Mauro,

This fixes one tricky v4l2-ctrls.c sparse warning and increases the number of buffers in vb2.

Regards,

Hans

The following changes since commit 1ef24960ab78554fe7e8e77d8fc86524fbd60d3c:

Merge tag 'v3.18-rc1' into patchwork (2014-10-21 08:32:51 -0200)

are available in the git repository at:

git://linuxtv.org/hverkuil/media_tree.git for-v3.19c

for you to fetch changes up to 0c0b10999ca6d68dc224d1330dc2541c66db0351:

v4l2-ctrls: fix sparse warning (2014-10-27 11:33:14 +0100)

----------------------------------------------------------------
Divneil Wadhawan (1):
vb2: replace VIDEO_MAX_FRAME with VB2_MAX_FRAME

Hans Verkuil (1):
v4l2-ctrls: fix sparse warning

 drivers/media/pci/saa7134/saa7134-ts.c       |  4 +--
 drivers/media/pci/saa7134/saa7134-vbi.c      |  4 +--
 drivers/media/pci/saa7134/saa7134-video.c    |  2 +-
 drivers/media/platform/mem2mem_testdev.c     |  2 +-
 drivers/media/platform/ti-vpe/vpe.c          |  2 +-
 drivers/media/platform/vivid/vivid-core.h    |  2 +-
 drivers/media/platform/vivid/vivid-ctrls.c   |  2 +-
 drivers/media/platform/vivid/vivid-vid-cap.c |  2 +-
 drivers/media/v4l2-core/v4l2-ctrls.c         | 87 +++++++++++++++++++++++++++++++++++++++--------------------------
 drivers/media/v4l2-core/videobuf2-core.c     |  8 +++---
 include/media/videobuf2-core.h               |  4 ++-
 11 files changed, 69 insertions(+), 50 deletions(-)