diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0422-staging-vc04-services-codec-Fix-logical-precedence-i.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0422-staging-vc04-services-codec-Fix-logical-precedence-i.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0422-staging-vc04-services-codec-Fix-logical-precedence-i.patch b/target/linux/bcm27xx/patches-5.10/950-0422-staging-vc04-services-codec-Fix-logical-precedence-i.patch new file mode 100644 index 0000000000..7d81cdfb02 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.10/950-0422-staging-vc04-services-codec-Fix-logical-precedence-i.patch @@ -0,0 +1,36 @@ +From 984a05a26dacc21487d4b0fef4296dd695f3e0d8 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.com> +Date: Sat, 2 Jan 2021 10:51:58 +0000 +Subject: [PATCH] staging/vc04-services/codec: Fix logical precedence + issue + +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> +--- + .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c ++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +@@ -908,7 +908,7 @@ static void op_buffer_cb(struct vchiq_mm + /* stream ended, or buffer being returned during disable. */ + v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: Empty buffer - flags %04x", + __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); + if (!port->enabled) + complete(&ctx->frame_cmplt); +@@ -1135,7 +1135,7 @@ static int vidioc_try_fmt(struct bcm2835 + if (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. */ + if (f->fmt.pix_mp.width < MIN_W) + f->fmt.pix_mp.width = MIN_W; |