Re: [PATCH 13/31] media: au0828 fix au0828_create_media_graph() entity checks
From: Mauro Carvalho Chehab <hidden>
Date: 2016-01-28 15:38:03
Also in:
alsa-devel, linux-media, lkml
Em Wed, 6 Jan 2016 13:27:02 -0700 Shuah Khan [off-list ref] escreveu:
au0828_create_media_graph() doesn't do any checks to determine, if vbi_dev, vdev, and input entities have been registered prior to creating pad links. Checking graph_obj.mdev field works as the graph_obj.mdev field gets initialized in the entity register interface. Fix it to check graph_obj.mdev field before creating pad links.
quoted hunk ↗ jump to hunk
Signed-off-by: Shuah Khan <redacted> --- drivers/media/usb/au0828/au0828-core.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c index f46fb43..8ef7c71 100644 --- a/drivers/media/usb/au0828/au0828-core.c +++ b/drivers/media/usb/au0828/au0828-core.c@@ -291,20 +291,27 @@ static int au0828_create_media_graph(struct au0828_dev *dev) if (ret) return ret; } - ret = media_create_pad_link(decoder, AU8522_PAD_VID_OUT, - &dev->vdev.entity, 0, - MEDIA_LNK_FL_ENABLED); - if (ret) - return ret; - ret = media_create_pad_link(decoder, AU8522_PAD_VBI_OUT, - &dev->vbi_dev.entity, 0, - MEDIA_LNK_FL_ENABLED); - if (ret) - return ret; + if (dev->vdev.entity.graph_obj.mdev) { + ret = media_create_pad_link(decoder, AU8522_PAD_VID_OUT, + &dev->vdev.entity, 0, + MEDIA_LNK_FL_ENABLED); + if (ret) + return ret; + }
Those new if() doesn't look right. We can't continue if the entities weren't registered, as the graph would have troubles. The logic should ensure that the entities will always be created before running au0828_create_media_graph(). If this is not the case, some async logic is needed to ensure that.
+ if (dev->vbi_dev.entity.graph_obj.mdev) {
+ ret = media_create_pad_link(decoder, AU8522_PAD_VBI_OUT,
+ &dev->vbi_dev.entity, 0,
+ MEDIA_LNK_FL_ENABLED);
+ if (ret)
+ return ret;
+ }
for (i = 0; i < AU0828_MAX_INPUT; i++) {
struct media_entity *ent = &dev->input_ent[i];
+ if (!ent->graph_obj.mdev)
+ continue;
+
if (AUVI_INPUT(i).type == AU0828_VMUX_UNDEFINED)
break;