msm: vidc: Fix warnings
Add V4L2_CAP_DEVICE_CAPS and update device_caps as per V4L2
requirement, and updated formats in v4l_fill_fmtdesc
to avoid warnings.
Change-Id: I7e9c0684ad5c663450c28a951ba3790216091013
Signed-off-by: Surajit Podder <spodder@codeaurora.org>
diff --git a/drivers/media/platform/msm/vidc_3x/msm_vidc.c b/drivers/media/platform/msm/vidc_3x/msm_vidc.c
index 7b22511..dd966f3 100644
--- a/drivers/media/platform/msm/vidc_3x/msm_vidc.c
+++ b/drivers/media/platform/msm/vidc_3x/msm_vidc.c
@@ -81,16 +81,24 @@
int msm_vidc_querycap(void *instance, struct v4l2_capability *cap)
{
+ int rc = -EINVAL;
struct msm_vidc_inst *inst = instance;
if (!inst || !cap)
return -EINVAL;
if (inst->session_type == MSM_VIDC_DECODER)
- return msm_vdec_querycap(instance, cap);
+ rc = msm_vdec_querycap(instance, cap);
else if (inst->session_type == MSM_VIDC_ENCODER)
- return msm_venc_querycap(instance, cap);
- return -EINVAL;
+ rc = msm_venc_querycap(instance, cap);
+ else
+ goto exit;
+ if (!rc) {
+ cap->device_caps = cap->capabilities;
+ cap->capabilities |= V4L2_CAP_DEVICE_CAPS;
+ }
+exit:
+ return rc;
}
EXPORT_SYMBOL(msm_vidc_querycap);