| From 9076291c1b1f96fe7095d473881906e3f24157bf Mon Sep 17 00:00:00 2001 |
| From: Steve Longerbeam <slongerbeam@gmail.com> |
| Date: Tue, 19 Feb 2019 20:09:38 -0500 |
| Subject: media: imx: vdic: Restore default case to prepare_vdi_in_buffers() |
| |
| [ Upstream commit ce3c2433b074eb9d569a0f63a15d6fd5dbc87f02 ] |
| |
| Restore a default case to prepare_vdi_in_buffers() to fix the following |
| smatch errors: |
| |
| drivers/staging/media/imx/imx-media-vdic.c:236 prepare_vdi_in_buffers() error: uninitialized symbol 'prev_phys'. |
| drivers/staging/media/imx/imx-media-vdic.c:237 prepare_vdi_in_buffers() error: uninitialized symbol 'curr_phys'. |
| drivers/staging/media/imx/imx-media-vdic.c:238 prepare_vdi_in_buffers() error: uninitialized symbol 'next_phys'. |
| |
| Fixes: 6e537b58de772 ("media: imx: vdic: rely on VDIC for correct field order") |
| |
| Reported-by: Hans Verkuil <hverkuil@xs4all.nl> |
| Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/staging/media/imx/imx-media-vdic.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c |
| index 8a9af4688fd41..8cdd3daa6c5f0 100644 |
| --- a/drivers/staging/media/imx/imx-media-vdic.c |
| +++ b/drivers/staging/media/imx/imx-media-vdic.c |
| @@ -231,6 +231,12 @@ static void __maybe_unused prepare_vdi_in_buffers(struct vdic_priv *priv, |
| curr_phys = vb2_dma_contig_plane_dma_addr(curr_vb, 0); |
| next_phys = vb2_dma_contig_plane_dma_addr(curr_vb, 0) + is; |
| break; |
| + default: |
| + /* |
| + * can't get here, priv->fieldtype can only be one of |
| + * the above. This is to quiet smatch errors. |
| + */ |
| + return; |
| } |
| |
| ipu_cpmem_set_buffer(priv->vdi_in_ch_p, 0, prev_phys); |
| -- |
| 2.20.1 |
| |