Skip to contentSkip to conversation

Various bug/regression fixes for 3.17

GIT PULL Hans Verkuil 1 participant 1 message Sep 21, 2014 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

Hi Mauro,

This collects my set of 3.17 patches, including the vb2 poll regression fix.

I have also included the poll documentation fixes here, but if you prefer to add those to 3.18 instead, then that's fine by me.

Besides this pull request for 3.17 I have two other pull requests for 3.17 as well that have not yet been merged:

https://patchwork.linuxtv.org/patch/25162/
https://patchwork.linuxtv.org/patch/25824/

And this cx18 fix for 3.17 is currently in your fixes branch, but not yet
upstream: https://patchwork.linuxtv.org/patch/25572/

Regards,

Hans

The following changes since commit f5281fc81e9a0a3e80b78720c5ae2ed06da3bfae:

[media] vpif: Fix compilation with allmodconfig (2014-09-09 18:08:08 -0300)

are available in the git repository at:

git://linuxtv.org/hverkuil/media_tree.git for-v3.17k

for you to fetch changes up to cd36be2ddfd6ff0ff823546caa03fb9a05dae54a:

DocBook media: improve the poll() documentation (2014-09-21 11:00:12 +0200)

----------------------------------------------------------------
Hans Verkuil (6):
adv7604: fix inverted condition
cx24123: fix kernel oops due to missing parent pointer
cx2341x: fix kernel oops
vb2: fix VBI/poll regression
DocBook media: fix the poll() 'no QBUF' documentation DocBook media: improve the poll() documentation

 Documentation/DocBook/media/v4l/func-poll.xml | 35 +++++++++++++++++++++++++++++------
 drivers/media/common/cx2341x.c                |  1 +
 drivers/media/dvb-frontends/cx24123.c         |  1 +
 drivers/media/i2c/adv7604.c                   |  2 +-
 drivers/media/v4l2-core/videobuf2-core.c      | 17 ++++++++++++++---
 include/media/videobuf2-core.h                |  4 ++++
 6 files changed, 50 insertions(+), 10 deletions(-)