1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
From e861be56136fd16394248f501bd3fbb327e40d1a Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
Date: Tue, 19 Mar 2019 17:55:09 +0000
Subject: [PATCH 372/773] staging: bcm2835-codec: NULL component handle on
queue_setup failure
queue_setup tries creating the relevant MMAL component and configures
the input and output ports as we're expecting to start streaming.
If the port configuration failed then it destroyed the component,
but failed to clear the component handle, therefore release tried
destroying the component again.
Adds some logging should the port config fail as well.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
---
.../bcm2835-codec/bcm2835-v4l2-codec.c | 15 +++++++++++++--
1 file changed, 13 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
@@ -1776,13 +1776,21 @@ static int bcm2835_codec_create_componen
ret = vchiq_mmal_port_set_format(dev->instance,
&ctx->component->input[0]);
- if (ret < 0)
+ if (ret < 0) {
+ v4l2_dbg(1, debug, &dev->v4l2_dev,
+ "%s: vchiq_mmal_port_set_format ip port failed\n",
+ __func__);
goto destroy_component;
+ }
ret = vchiq_mmal_port_set_format(dev->instance,
&ctx->component->output[0]);
- if (ret < 0)
+ if (ret < 0) {
+ v4l2_dbg(1, debug, &dev->v4l2_dev,
+ "%s: vchiq_mmal_port_set_format op port failed\n",
+ __func__);
goto destroy_component;
+ }
if (dev->role == ENCODE) {
u32 param = 1;
@@ -1812,11 +1820,14 @@ static int bcm2835_codec_create_componen
ctx->q_data[V4L2_M2M_DST].sizeimage,
ctx->component->output[0].minimum_buffer.size);
}
+ v4l2_dbg(2, debug, &dev->v4l2_dev, "%s: component created as %s\n",
+ __func__, components[dev->role]);
return 0;
destroy_component:
vchiq_mmal_component_finalise(ctx->dev->instance, ctx->component);
+ ctx->component = NULL;
return ret;
}
|
