diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2022-10-17 15:09:06 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-10-25 16:43:34 +0100 |
| commit | 69d78a80da4ef12faf2a6f9cfa2097ab4ac43983 (patch) | |
| tree | 0444f4c9e9550cda4b4b28b83892b6ff0be1b09b /drivers/media | |
| parent | 957148e22870e4021082dddd12f8619a49d9bb50 (diff) | |
| download | linux-stable-69d78a80da4ef12faf2a6f9cfa2097ab4ac43983.tar.gz linux-stable-69d78a80da4ef12faf2a6f9cfa2097ab4ac43983.tar.bz2 linux-stable-69d78a80da4ef12faf2a6f9cfa2097ab4ac43983.zip | |
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 <hverkuil-cisco@xs4all.nl>
Fixes: 0c90f649d2f5 (media: vivid: add vivid_create_queue() helper)
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/test-drivers/vivid/vivid-core.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/media/test-drivers/vivid/vivid-core.c b/drivers/media/test-drivers/vivid/vivid-core.c index 61d48fbc3d15..f28440e6c9f8 100644 --- a/drivers/media/test-drivers/vivid/vivid-core.c +++ b/drivers/media/test-drivers/vivid/vivid-core.c @@ -942,8 +942,12 @@ static int vivid_detect_feature_set(struct vivid_dev *dev, int inst, /* how many inputs do we have and of what type? */ dev->num_inputs = num_inputs[inst]; - if (dev->num_inputs < 1) - dev->num_inputs = 1; + if (node_type & 0x20007) { + if (dev->num_inputs < 1) + dev->num_inputs = 1; + } else { + dev->num_inputs = 0; + } if (dev->num_inputs >= MAX_INPUTS) dev->num_inputs = MAX_INPUTS; for (i = 0; i < dev->num_inputs; i++) { @@ -960,8 +964,12 @@ static int vivid_detect_feature_set(struct vivid_dev *dev, int inst, /* how many outputs do we have and of what type? */ dev->num_outputs = num_outputs[inst]; - if (dev->num_outputs < 1) - dev->num_outputs = 1; + if (node_type & 0x40300) { + if (dev->num_outputs < 1) + dev->num_outputs = 1; + } else { + dev->num_outputs = 0; + } if (dev->num_outputs >= MAX_OUTPUTS) dev->num_outputs = MAX_OUTPUTS; for (i = 0; i < dev->num_outputs; i++) { |