From: Jeffy Chen Date: Wed, 8 Jun 2016 06:18:24 +0000 (+0800) Subject: [media] rockchip-vpu: change V4L2_CTRL_ID2CLASS to V4L2_CTRL_ID2WHICH X-Git-Tag: firefly_0821_release~2286 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=17464199f06e45f26067bbb637e71d2a5f50ab67;p=firefly-linux-kernel-4.4.55.git [media] rockchip-vpu: change V4L2_CTRL_ID2CLASS to V4L2_CTRL_ID2WHICH Change-Id: I700e8564caa08eb3239d4801cef9c1e04699fe6f Signed-off-by: Jeffy Chen Signed-off-by: Yakir Yang --- diff --git a/drivers/media/platform/rockchip-vpu/rockchip_vpu.c b/drivers/media/platform/rockchip-vpu/rockchip_vpu.c index e7bb63562e2f..64d79bdf8892 100644 --- a/drivers/media/platform/rockchip-vpu/rockchip_vpu.c +++ b/drivers/media/platform/rockchip-vpu/rockchip_vpu.c @@ -228,7 +228,7 @@ void rockchip_vpu_try_context(struct rockchip_vpu_dev *dev, * Control registration. */ -#define IS_VPU_PRIV(x) ((V4L2_CTRL_ID2CLASS(x) == V4L2_CTRL_CLASS_MPEG) && \ +#define IS_VPU_PRIV(x) ((V4L2_CTRL_ID2WHICH(x) == V4L2_CTRL_CLASS_MPEG) && \ V4L2_CTRL_DRIVER_PRIV(x)) int rockchip_vpu_ctrls_setup(struct rockchip_vpu_ctx *ctx,