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.
Signed-off-by: Shuah Khan shuahkh@osg.samsung.com --- drivers/media/usb/au0828/au0828-core.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c index b04c2a5..4fd7db8 100644 --- a/drivers/media/usb/au0828/au0828-core.c +++ b/drivers/media/usb/au0828/au0828-core.c @@ -287,20 +287,28 @@ 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; + } + 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;