c0193cb2e76ea31f67e6f54bb9cddff150cf7bae
[openwrt/staging/ldir.git] / target / linux / bcm27xx / patches-5.4 / 950-0976-staging-bcm2835-codec-Correct-buffer-number-change-o.patch
1 From 96f4d69496b483b8eb65dc4602d5cb96844f6647 Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
3 Date: Wed, 30 Sep 2020 12:13:44 +0100
4 Subject: [PATCH] staging: bcm2835-codec: Correct buffer number
5 change on start streaming
6
7 "cac8c90 staging: vc04_service: codec: Allow start_streaming to update
8 the buffernum" allowed the number of buffers configured to be decreased
9 as well as increased, but there is no requirement for all buffers to
10 have been queued when start_streaming is called.
11
12 Only allow increasing the buffernum.
13
14 Fixes: "cac8c90 staging: vc04_service: codec: Allow start_streaming to update the buffernum"
15 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
16 ---
17 .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
21 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
22 @@ -2290,7 +2290,7 @@ static int bcm2835_codec_start_streaming
23 if (count < port->minimum_buffer.num)
24 count = port->minimum_buffer.num;
25
26 - if (port->current_buffer.num != count + 1) {
27 + if (port->current_buffer.num < count + 1) {
28 v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: ctx:%p, buffer count changed %u to %u\n",
29 __func__, ctx, port->current_buffer.num, count + 1);
30