Skip to contentSkip to conversation

Various fixes

GIT PULL Hans Verkuil 1 participant 2 messages Aug 14, 2014 – Aug 22, 2014 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

Hi Mauro,

Various fixes for v3.18.

Please take a good look at the 'videobuf2: fix lockdep warning'. Locking issues are always complex and an extra pair of eyeballs doesn't hurt. I also have been in two minds whether it should go into 3.17 or 3.18, but I think it is better to have it go through a longer test period. But I can be convinced to go for 3.17 as well :-)

Regards,

Hans

The following changes since commit 0f3bf3dc1ca394a8385079a5653088672b65c5c4:

[media] cx23885: fix UNSET/TUNER_ABSENT confusion (2014-08-01 15:30:59 -0300)

are available in the git repository at:

git://linuxtv.org/hverkuil/media_tree.git for-v3.18a

for you to fetch changes up to 481a56ce8ef5dc6670ffcd87e58903323d23d0f3:

usbtv: add audio support (2014-08-14 12:29:39 +0200)

----------------------------------------------------------------
Andreas Ruprecht (1):
drivers: media: pci: Makefile: Remove duplicate subdirectory from obj-y

Axel Lin (1):
saa6752hs: Convert to devm_kzalloc()

Dan Carpenter (1):
vmalloc_sg: off by one in error handling

Federico Simoncelli (1):
usbtv: add audio support

Geert Uytterhoeven (2):
cx25840: Spelling s/compuations/computations/
cx23885: Spelling s/compuations/computations/

Hans Verkuil (3):
videobuf2: fix lockdep warning DocBook media: fix order of v4l2_edid fields
vb2: use pr_info instead of pr_debug

 Documentation/DocBook/media/v4l/vidioc-g-edid.xml |  12 +--
 drivers/media/i2c/cx25840/cx25840-ir.c            |   2 +-
 drivers/media/i2c/saa6752hs.c                     |   6 +-
 drivers/media/pci/Makefile                        |   1 -
 drivers/media/pci/cx23885/cx23888-ir.c            |   2 +-
 drivers/media/usb/usbtv/Makefile                  |   3 +-
 drivers/media/usb/usbtv/usbtv-audio.c             | 384 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/media/usb/usbtv/usbtv-core.c              |  16 +++-
 drivers/media/usb/usbtv/usbtv-video.c             |   9 +-
 drivers/media/usb/usbtv/usbtv.h                   |  21 ++++-
 drivers/media/v4l2-core/videobuf-dma-sg.c         |   6 +-
 drivers/media/v4l2-core/videobuf2-core.c          |  58 ++++--------
 include/media/videobuf2-core.h                    |   2 +
 13 files changed, 460 insertions(+), 62 deletions(-)
 create mode 100644 drivers/media/usb/usbtv/usbtv-audio.c
#1 lore raw
Quoted 39 lines · Hans Verkuil

Hi Mauro,

Various fixes for v3.18.

Please take a good look at the 'videobuf2: fix lockdep warning'. Locking issues are always complex and an extra pair of eyeballs doesn't hurt. I also have been in two minds whether it should go into 3.17 or 3.18, but I think it is better to have it go through a longer test period. But I can be convinced to go for 3.17 as well :-)

Regards,

Hans

The following changes since commit 0f3bf3dc1ca394a8385079a5653088672b65c5c4:

[media] cx23885: fix UNSET/TUNER_ABSENT confusion (2014-08-01 15:30:59 -0300)

are available in the git repository at:

git://linuxtv.org/hverkuil/media_tree.git for-v3.18a

for you to fetch changes up to 481a56ce8ef5dc6670ffcd87e58903323d23d0f3:

usbtv: add audio support (2014-08-14 12:29:39 +0200)

----------------------------------------------------------------
Andreas Ruprecht (1):
drivers: media: pci: Makefile: Remove duplicate subdirectory from obj-y

Axel Lin (1):
saa6752hs: Convert to devm_kzalloc()

Dan Carpenter (1):
vmalloc_sg: off by one in error handling

Federico Simoncelli (1):
usbtv: add audio support

Quoted 6 lines

Geert Uytterhoeven (2):
cx25840: Spelling s/compuations/computations/
cx23885: Spelling s/compuations/computations/

Hans Verkuil (3):
videobuf2: fix lockdep warning

This one is wrong, I'll post a v5 for it today.

Regards,

Hans

Quoted 22 lines

DocBook media: fix order of v4l2_edid fields
vb2: use pr_info instead of pr_debug

 Documentation/DocBook/media/v4l/vidioc-g-edid.xml |  12 +--
 drivers/media/i2c/cx25840/cx25840-ir.c            |   2 +-
 drivers/media/i2c/saa6752hs.c                     |   6 +-
 drivers/media/pci/Makefile                        |   1 -
 drivers/media/pci/cx23885/cx23888-ir.c            |   2 +-
 drivers/media/usb/usbtv/Makefile                  |   3 +-
 drivers/media/usb/usbtv/usbtv-audio.c             | 384 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/media/usb/usbtv/usbtv-core.c              |  16 +++-
 drivers/media/usb/usbtv/usbtv-video.c             |   9 +-
 drivers/media/usb/usbtv/usbtv.h                   |  21 ++++-
 drivers/media/v4l2-core/videobuf-dma-sg.c         |   6 +-
 drivers/media/v4l2-core/videobuf2-core.c          |  58 ++++--------
 include/media/videobuf2-core.h                    |   2 +
 13 files changed, 460 insertions(+), 62 deletions(-)
 create mode 100644 drivers/media/usb/usbtv/usbtv-audio.c
Signature · 3 lines
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html