diff options
| author |   Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-09-27 10:27:48 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-09-27 10:27:56 +0200 |
| commit | d67614f276c1499ad939fa5c1aadd35498cc6b34 (patch) | |
| tree | e8c6962c714f0ef0275dd103bf5be56513412492 /drivers/staging | |
| parent | media: sun6i-csi: Move csi buffer definition to main header file (diff) | |
| parent | media: rkvdec: Disable H.264 error detection (diff) | |
| download | linux-dev-d67614f276c1499ad939fa5c1aadd35498cc6b34.tar.xz linux-dev-d67614f276c1499ad939fa5c1aadd35498cc6b34.zip | |
Merge fixes into media_stage
* fixes:
media: rkvdec: Disable H.264 error detection
media: mediatek: vcodec: Drop platform_get_resource(IORESOURCE_IRQ)
media: dvb_vb2: fix possible out of bound access
media: v4l2-ioctl.c: fix incorrect error path
media: v4l2-compat-ioctl32.c: zero buffer passed to v4l2_compat_get_array_args()
media: uvcvideo: Fix InterfaceProtocol for Quanta camera
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/rkvdec/rkvdec-h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c index 4af5a831bde0..4fc167b42cf0 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -1162,8 +1162,8 @@ static int rkvdec_h264_run(struct rkvdec_ctx *ctx) schedule_delayed_work(&rkvdec->watchdog_work, msecs_to_jiffies(2000)); - writel(0xffffffff, rkvdec->regs + RKVDEC_REG_STRMD_ERR_EN); - writel(0xffffffff, rkvdec->regs + RKVDEC_REG_H264_ERR_E); + writel(0, rkvdec->regs + RKVDEC_REG_STRMD_ERR_EN); + writel(0, rkvdec->regs + RKVDEC_REG_H264_ERR_E); writel(1, rkvdec->regs + RKVDEC_REG_PREF_LUMA_CACHE_COMMAND); writel(1, rkvdec->regs + RKVDEC_REG_PREF_CHR_CACHE_COMMAND); |