diff options
| author | Boris Brezillon <boris.brezillon@collabora.com> | 2019-04-25 03:12:26 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-05-28 12:12:24 -0400 |
| commit | 6002e0be75715a3698af89b79fe3829414bf1441 (patch) | |
| tree | 30c4a28beaf1d289f3ed277eacb15349a18fdc94 /drivers/staging | |
| parent | 9d4e1f745d5888b386a807792a3814e8f23eacdc (diff) | |
| download | linux-stable-6002e0be75715a3698af89b79fe3829414bf1441.tar.gz linux-stable-6002e0be75715a3698af89b79fe3829414bf1441.tar.bz2 linux-stable-6002e0be75715a3698af89b79fe3829414bf1441.zip | |
media: rockchip/vpu: Remove a useless test
vdev is guaranteed to be equal to vpu->vfd_enc thanks a test done a few
lines above. Remove this useless test.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c index 21d2591e7b7b..3c3ce3baeb6d 100644 --- a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c +++ b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c @@ -271,10 +271,8 @@ static int rockchip_vpu_open(struct file *filp) filp->private_data = &ctx->fh; v4l2_fh_add(&ctx->fh); - if (vdev == vpu->vfd_enc) { - rockchip_vpu_enc_reset_dst_fmt(vpu, ctx); - rockchip_vpu_enc_reset_src_fmt(vpu, ctx); - } + rockchip_vpu_enc_reset_dst_fmt(vpu, ctx); + rockchip_vpu_enc_reset_src_fmt(vpu, ctx); ret = rockchip_vpu_ctrls_setup(vpu, ctx); if (ret) { |