diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 15:02:41 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 15:02:41 -0400 |
| commit | 4757ae22de6d283906eaa031ba3b816c7de61b00 (patch) | |
| tree | d1b0245a1f26ff2766f26ca5a6f0acf73ef8d6a3 | |
| parent | 8109ed99dffe2ec974fc5ce87bd1da0ef4dd721c (diff) | |
| download | longterm-queue-4.12-4757ae22de6d283906eaa031ba3b816c7de61b00.tar.gz | |
media: drop patch for code not in 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/media-camss-vfe-always-initialize-reg-at-vfe_set_xba.patch | 35 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 36 deletions
diff --git a/queue/media-camss-vfe-always-initialize-reg-at-vfe_set_xba.patch b/queue/media-camss-vfe-always-initialize-reg-at-vfe_set_xba.patch deleted file mode 100644 index 4120f40..0000000 --- a/queue/media-camss-vfe-always-initialize-reg-at-vfe_set_xba.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9917fbcfa20ab987d6381fd0365665e5c1402d75 Mon Sep 17 00:00:00 2001 -From: Mauro Carvalho Chehab <mchehab@s-opensource.com> -Date: Wed, 1 Nov 2017 08:09:59 -0400 -Subject: [PATCH] media: camss-vfe: always initialize reg at vfe_set_xbar_cfg() - -commit 9917fbcfa20ab987d6381fd0365665e5c1402d75 upstream. - -if output->wm_num is bigger than 2, the value for reg is -not initialized, as warned by smatch: - drivers/media/platform/qcom/camss-8x16/camss-vfe.c:633 vfe_set_xbar_cfg() error: uninitialized symbol 'reg'. - drivers/media/platform/qcom/camss-8x16/camss-vfe.c:637 vfe_set_xbar_cfg() error: uninitialized symbol 'reg'. - -That shouldn't happen in practice, so add a logic that will -break the loop if i > 1, fixing the warnings. - -Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> -Acked-by: Todor Tomov <todor.tomov@linaro.org> - -diff --git a/drivers/media/platform/qcom/camss-8x16/camss-vfe.c b/drivers/media/platform/qcom/camss-8x16/camss-vfe.c -index b22d2dfcd3c2..55232a912950 100644 ---- a/drivers/media/platform/qcom/camss-8x16/camss-vfe.c -+++ b/drivers/media/platform/qcom/camss-8x16/camss-vfe.c -@@ -622,6 +622,9 @@ static void vfe_set_xbar_cfg(struct vfe_device *vfe, struct vfe_output *output, - reg = VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_EN; - if (p == V4L2_PIX_FMT_NV12 || p == V4L2_PIX_FMT_NV16) - reg |= VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_SWAP_INTER_INTRA; -+ } else { -+ /* On current devices output->wm_num is always <= 2 */ -+ break; - } - - if (output->wm_idx[i] % 2 == 1) --- -2.15.0 - diff --git a/queue/series b/queue/series index ff8144c..27eeed1 100644 --- a/queue/series +++ b/queue/series @@ -52,7 +52,6 @@ crypto-tcrypt-fix-buffer-lengths-in-test_aead_speed.patch clk-mediatek-add-the-option-for-determining-PLL-sour.patch clk-imx-imx7d-Fix-parent-clock-for-OCRAM_CLK.patch clk-imx6-refine-hdmi_isfr-s-parent-to-make-HDMI-work.patch -media-camss-vfe-always-initialize-reg-at-vfe_set_xba.patch clk-hi6220-mark-clock-cs_atb_syspll-as-critical.patch blk-mq-sched-dispatch-from-scheduler-IFF-progress-is.patch clk-tegra-Use-readl_relaxed_poll_timeout_atomic-in-t.patch |