raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

staging/vc04-services/codec: Fix logical precedence issue

Browse Source 
Two issues identified with operator precedence in logical
expressions. Fix them.

https://github.com/raspberrypi/linux/issues/4040

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
This commit is contained in:
Dave Stevenson
2021-01-02 10:51:58 +00:00
committed by popcornmix
parent 9ba3b5adbb
commit 3a87014a0b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
View File

@@ -908,7 +908,7 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance,
/* stream ended, or buffer being returned during disable. */ /* stream ended, or buffer being returned during disable. */
v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: Empty buffer - flags %04x", v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: Empty buffer - flags %04x",
__func__, mmal_buf->mmal_flags); __func__, mmal_buf->mmal_flags);
if (!mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS) { if (!(mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS)) {
vb2_buffer_done(&vb2->vb2_buf, VB2_BUF_STATE_ERROR); vb2_buffer_done(&vb2->vb2_buf, VB2_BUF_STATE_ERROR);
if (!port->enabled) if (!port->enabled)
complete(&ctx->frame_cmplt); complete(&ctx->frame_cmplt);
@@ -1135,7 +1135,7 @@ static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
if (f->fmt.pix_mp.height > MAX_H) if (f->fmt.pix_mp.height > MAX_H)
f->fmt.pix_mp.height = MAX_H; f->fmt.pix_mp.height = MAX_H;
if (!fmt->flags & V4L2_FMT_FLAG_COMPRESSED) { if (!(fmt->flags & V4L2_FMT_FLAG_COMPRESSED)) {
/* Only clip min w/h on capture. Treat 0x0 as unknown. */ /* Only clip min w/h on capture. Treat 0x0 as unknown. */
if (f->fmt.pix_mp.width < MIN_W) if (f->fmt.pix_mp.width < MIN_W)
f->fmt.pix_mp.width = MIN_W; f->fmt.pix_mp.width = MIN_W;