Skip to content

Commit 69d78a8

Browse files
Hans Verkuilmchehab
authored andcommitted
media: vivid: set num_in/outputs to 0 if not supported
If node_types does not have video/vbi/meta inputs or outputs, then set num_inputs/num_outputs to 0 instead of 1. Signed-off-by: Hans Verkuil <[email protected]> Fixes: 0c90f64 (media: vivid: add vivid_create_queue() helper) Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 957148e commit 69d78a8

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

drivers/media/test-drivers/vivid/vivid-core.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -942,8 +942,12 @@ static int vivid_detect_feature_set(struct vivid_dev *dev, int inst,
942942

943943
/* how many inputs do we have and of what type? */
944944
dev->num_inputs = num_inputs[inst];
945-
if (dev->num_inputs < 1)
946-
dev->num_inputs = 1;
945+
if (node_type & 0x20007) {
946+
if (dev->num_inputs < 1)
947+
dev->num_inputs = 1;
948+
} else {
949+
dev->num_inputs = 0;
950+
}
947951
if (dev->num_inputs >= MAX_INPUTS)
948952
dev->num_inputs = MAX_INPUTS;
949953
for (i = 0; i < dev->num_inputs; i++) {
@@ -960,8 +964,12 @@ static int vivid_detect_feature_set(struct vivid_dev *dev, int inst,
960964

961965
/* how many outputs do we have and of what type? */
962966
dev->num_outputs = num_outputs[inst];
963-
if (dev->num_outputs < 1)
964-
dev->num_outputs = 1;
967+
if (node_type & 0x40300) {
968+
if (dev->num_outputs < 1)
969+
dev->num_outputs = 1;
970+
} else {
971+
dev->num_outputs = 0;
972+
}
965973
if (dev->num_outputs >= MAX_OUTPUTS)
966974
dev->num_outputs = MAX_OUTPUTS;
967975
for (i = 0; i < dev->num_outputs; i++) {

0 commit comments

Comments
 (0)