summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/mtk-vpu/mtk_vpu.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2019-11-26 14:37:47 +0100
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2019-11-26 14:37:47 +0100
commit0ca40f41d795fd91811e44506bb73d0b9ca33bdd (patch)
tree16b6e21230375ea7184feb53f21786f72a448400 /drivers/media/platform/mtk-vpu/mtk_vpu.c
parent3e84a18a259e1df35e5b549ab92ec3baf82ff010 (diff)
parentdca6b3733a4a46e63603496f544ece8ace541fde (diff)
downloadblackbird-op-linux-0ca40f41d795fd91811e44506bb73d0b9ca33bdd.tar.gz
blackbird-op-linux-0ca40f41d795fd91811e44506bb73d0b9ca33bdd.zip
Merge branch 'patchwork' into v4l_for_linus
* patchwork: (360 commits) media: Revert "media: mtk-vcodec: Remove extra area allocation in an input buffer on encoding" media: hantro: Set H264 FIELDPIC_FLAG_E flag correctly media: hantro: Remove now unused H264 pic_size media: hantro: Use output buffer width and height for H264 decoding media: hantro: Reduce H264 extra space for motion vectors media: hantro: Fix H264 motion vector buffer offset media: ti-vpe: vpe: fix compatible to match bindings media: dt-bindings: media: ti-vpe: Document VPE driver media: zr364xx: remove redundant assigmnent to idx, clean up code media: Documentation: media: *_DEFAULT targets for subdevs media: hantro: Fix s_fmt for dynamic resolution changes media: i2c: Use the correct style for SPDX License Identifier media: siano: Use the correct style for SPDX License Identifier media: vicodec: media_device_cleanup was called too early media: vim2m: media_device_cleanup was called too early media: cedrus: Increase maximum supported size media: cedrus: Fix H264 4k support media: cedrus: Properly signal size in mode register media: v4l2-ctrl: Lock main_hdl on operations of requests_queued. media: si470x-i2c: add missed operations in remove ...
Diffstat (limited to 'drivers/media/platform/mtk-vpu/mtk_vpu.c')
-rw-r--r--drivers/media/platform/mtk-vpu/mtk_vpu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
index cc2ff40d060d..a768707abb94 100644
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
@@ -273,7 +273,7 @@ int vpu_ipi_register(struct platform_device *pdev,
return -EPROBE_DEFER;
}
- if (id >= 0 && id < IPI_MAX && handler) {
+ if (id < IPI_MAX && handler) {
ipi_desc = vpu->ipi_desc;
ipi_desc[id].name = name;
ipi_desc[id].handler = handler;
@@ -398,7 +398,7 @@ int vpu_wdt_reg_handler(struct platform_device *pdev,
handler = vpu->wdt.handler;
- if (id >= 0 && id < VPU_RST_MAX && wdt_reset) {
+ if (id < VPU_RST_MAX && wdt_reset) {
dev_dbg(vpu->dev, "wdt register id %d\n", id);
mutex_lock(&vpu->vpu_mutex);
handler[id].reset_func = wdt_reset;
OpenPOWER on IntegriCloud