This pull request makes sure all drivers set v4l2_dev, which is needed for correct behavior of the debug ioctls if sub-devices are present. It also fixes a bug in cx88 where the wrong parent was used, causing an incorrect sysfs hierarchy. This pull request is identical to the earlier posted series: http://www.mail-archive.com/linux-media@xxxxxxxxxxxxxxx/msg63227.html except for correcting a typo in a commit and in v4l2-framework.txt. Regards, Hans The following changes since commit 37c1d2e4098e48d9107858246027510efcfd7774: Merge branch 'linus' into patchwork (2013-06-20 05:19:09 -0300) are available in the git repository at: git://linuxtv.org/hverkuil/media_tree.git parent for you to fetch changes up to 655772893f595334b0d20a44c3d973aa7577436e: v4l2-framework: update documentation (2013-06-20 15:58:07 +0200) ---------------------------------------------------------------- Hans Verkuil (13): v4l2-device: check if already unregistered. soc_camera: replace vdev->parent by vdev->v4l2_dev. cx23885-417: use v4l2_dev instead of the deprecated parent field. zoran: use v4l2_dev instead of the deprecated parent field. sn9c102_core: add v4l2_device and replace parent with v4l2_dev saa7164: add v4l2_device and replace parent with v4l2_dev pvrusb2: use v4l2_dev instead of the deprecated parent field. f_uvc: add v4l2_device and replace parent with v4l2_dev omap24xxcam: add v4l2_device and replace parent with v4l2_dev saa7134: use v4l2_dev instead of the deprecated parent field v4l2: always require v4l2_dev, rename parent to dev_parent cx88: set dev_parent to the correct parent PCI bus. v4l2-framework: update documentation Documentation/video4linux/v4l2-framework.txt | 17 +++++++++++------ drivers/media/pci/cx23885/cx23885-417.c | 2 +- drivers/media/pci/cx88/cx88-core.c | 7 +++++++ drivers/media/pci/saa7134/saa7134-empress.c | 2 +- drivers/media/pci/saa7164/saa7164-core.c | 7 +++++++ drivers/media/pci/saa7164/saa7164-encoder.c | 2 +- drivers/media/pci/saa7164/saa7164-vbi.c | 2 +- drivers/media/pci/saa7164/saa7164.h | 3 +++ drivers/media/pci/zoran/zoran_card.c | 2 +- drivers/media/platform/omap24xxcam.c | 9 ++++++++- drivers/media/platform/omap24xxcam.h | 3 +++ drivers/media/platform/soc_camera/soc_camera.c | 5 +++-- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 4 ++++ drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 4 ++++ drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 7 ++++--- drivers/media/usb/sn9c102/sn9c102.h | 3 +++ drivers/media/usb/sn9c102/sn9c102_core.c | 13 ++++++++++++- drivers/media/v4l2-core/v4l2-dev.c | 34 +++++++++++++++------------------- drivers/media/v4l2-core/v4l2-device.c | 9 +++++++-- drivers/media/v4l2-core/v4l2-ioctl.c | 7 +------ drivers/usb/gadget/f_uvc.c | 9 ++++++++- drivers/usb/gadget/uvc.h | 2 ++ include/media/soc_camera.h | 4 ++-- include/media/v4l2-dev.h | 4 ++-- 24 files changed, 111 insertions(+), 50 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
