[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-59-g5edcafb

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  5edcafb29657dfb913aca8e0189d03e3d9967393 (commit)
      from  3efba309430306807c3c2154021194cc8179acf3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5edcafb29657dfb913aca8e0189d03e3d9967393
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Fri Apr 8 17:52:06 2016 +0200

    [LINUX] APF6: 3.19+: fixes kernel Ooops when using v4l2-ctl

-----------------------------------------------------------------------

Summary of changes:
 ...-in-v4l2-when-asking-for-capture-controls.patch |   20 ++++++++++++++++++++
 ...-v4l2-when-asking-for-capture-controls.to_check |   20 ++++++++++++++++++++
 2 files changed, 40 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/3.19/0631-armadeus-media-imx6-fixes-kernel-ooops-in-v4l2-when-asking-for-capture-controls.patch
 create mode 100644 patches/linux/4.4/0631-armadeus-media-imx6-fixes-kernel-ooops-in-v4l2-when-asking-for-capture-controls.to_check

diff --git a/patches/linux/3.19/0631-armadeus-media-imx6-fixes-kernel-ooops-in-v4l2-when-asking-for-capture-controls.patch b/patches/linux/3.19/0631-armadeus-media-imx6-fixes-kernel-ooops-in-v4l2-when-asking-for-capture-controls.patch
new file mode 100644
index 0000000..2d9e275
--- /dev/null
+++ b/patches/linux/3.19/0631-armadeus-media-imx6-fixes-kernel-ooops-in-v4l2-when-asking-for-capture-controls.patch
@@ -0,0 +1,20 @@
+Fixes kernel Ooops (WARN_ON()) in V4L2 layers when asking for camera
+controls.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+diff -urN linux-3.19.8/drivers/staging/media/imx6/capture/mx6-camif.c linux-3.19.8.2016_04_08_16h03/drivers/staging/media/imx6/capture/mx6-camif.c
+--- linux-3.19.8/drivers/staging/media/imx6/capture/mx6-camif.c	2016-04-08 16:04:12.631829531 +0200
++++ linux-3.19.8.2016_04_08_16h03/drivers/staging/media/imx6/capture/mx6-camif.c	2016-04-06 15:34:38.867631610 +0200
+@@ -825,8 +825,9 @@
+ 	strncpy(cap->driver, DEVICE_NAME, sizeof(cap->driver) - 1);
+ 	strncpy(cap->card, DEVICE_NAME, sizeof(cap->card) - 1);
+ 	cap->bus_info[0] = 0;
+-	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |
+-		V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OVERLAY;
++	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING |
++				V4L2_CAP_VIDEO_OVERLAY;
++	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
+ 
+ 	return 0;
+ }
diff --git a/patches/linux/4.4/0631-armadeus-media-imx6-fixes-kernel-ooops-in-v4l2-when-asking-for-capture-controls.to_check b/patches/linux/4.4/0631-armadeus-media-imx6-fixes-kernel-ooops-in-v4l2-when-asking-for-capture-controls.to_check
new file mode 100644
index 0000000..5e3eaf1
--- /dev/null
+++ b/patches/linux/4.4/0631-armadeus-media-imx6-fixes-kernel-ooops-in-v4l2-when-asking-for-capture-controls.to_check
@@ -0,0 +1,20 @@
+Fixes kernel Ooops (WARN_ON()) in V4L2 layers when asking for camera
+controls.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+diff -urN linux/drivers/staging/media/imx6/capture/mx6-camif.c linux.mod/drivers/staging/media/imx6/capture/mx6-camif.c
+--- linux/drivers/staging/media/imx6/capture/mx6-camif.c
++++ linux.mod/drivers/staging/media/imx6/capture/mx6-camif.c
+@@ -825,8 +825,9 @@
+ 	strncpy(cap->driver, DEVICE_NAME, sizeof(cap->driver) - 1);
+ 	strncpy(cap->card, DEVICE_NAME, sizeof(cap->card) - 1);
+ 	cap->bus_info[0] = 0;
+-	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |
+-		V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OVERLAY;
++	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING |
++				V4L2_CAP_VIDEO_OVERLAY;
++	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
+ 
+ 	return 0;
+ }


hooks/post-receive
-- 
armadeus