[RFC PATCH 12/26] [media] v4l2: Fix V4L2_CID_PIXEL_RATE

[Philipp Zabel]

From: Sascha Hauer <s.ha...@pengutronix.de>

Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de>
---
 drivers/media/v4l2-core/v4l2-ctrls.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c 
b/drivers/media/v4l2-core/v4l2-ctrls.c
index 55c6832..6a6ccc5 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -1048,7 +1048,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum 
v4l2_ctrl_type *type,
        case V4L2_CID_PIXEL_RATE:
                *type = V4L2_CTRL_TYPE_INTEGER64;
                *flags |= V4L2_CTRL_FLAG_READ_ONLY;
-               *min = *max = *step = *def = 0;
+               *min = *max = *step = 0;
                break;
        default:
                *type = V4L2_CTRL_TYPE_INTEGER;
@@ -1710,7 +1710,11 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct 
v4l2_ctrl_handler *hdl,
        else if (type == V4L2_CTRL_TYPE_INTEGER_MENU)
                ctrl->qmenu_int = qmenu_int;
        ctrl->priv = priv;
-       ctrl->cur.val = ctrl->val = ctrl->default_value = def;
+
+       if (type == V4L2_CTRL_TYPE_INTEGER64)
+               ctrl->val64 = ctrl->cur.val64 = def;
+       else
+               ctrl->cur.val = ctrl->val = ctrl->default_value = def;
 
        if (ctrl->type == V4L2_CTRL_TYPE_STRING) {
                ctrl->cur.string = (char *)&ctrl[1] + sz_extra - (max + 1);
-- 
2.0.0.rc2

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html