Change au0828_create_media_graph() to create pad link
between MEDIA_ENT_F_AUDIO_MIXER entity and decoder's
AU8522_PAD_AUDIO_OUT.
Signed-off-by: Shuah Khan <shuahkh@xxxxxxxxxxxxxxx>
---
drivers/media/usb/au0828/au0828-core.c | 12 ++++++++++++
drivers/media/usb/au0828/au0828.h | 1 +
2 files changed, 13 insertions(+)
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
index 7af5d0d..84b2405 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -225,6 +225,7 @@ void au0828_create_media_graph(struct media_entity *new, void *notify_data)
struct media_entity *entity;
struct media_entity *tuner = NULL, *decoder = NULL;
struct media_entity *audio_capture = NULL;
+ struct media_entity *mixer = NULL;
int i, ret;
if (!mdev)
@@ -245,6 +246,9 @@ void au0828_create_media_graph(struct media_entity *new, void *notify_data)
case MEDIA_ENT_F_AUDIO_CAPTURE:
audio_capture = entity;
break;
+ case MEDIA_ENT_F_AUDIO_MIXER:
+ mixer = entity;
+ break;
}
}
@@ -316,6 +320,14 @@ void au0828_create_media_graph(struct media_entity *new, void *notify_data)
if (ret == 0)
dev->audio_capture_linked = 1;
}
+
+ if (mixer && !dev->mixer_linked) {
+ ret = media_create_pad_link(decoder, AU8522_PAD_AUDIO_OUT,
+ mixer, 0,
+ MEDIA_LNK_FL_ENABLED);
+ if (ret == 0)
+ dev->mixer_linked = 1;
+ }
#endif
}
diff --git a/drivers/media/usb/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h
index 2f4d597..6dd81b2 100644
--- a/drivers/media/usb/au0828/au0828.h
+++ b/drivers/media/usb/au0828/au0828.h
@@ -288,6 +288,7 @@ struct au0828_dev {
bool vdev_linked;
bool vbi_linked;
bool audio_capture_linked;
+ bool mixer_linked;
struct media_link *active_link;
struct media_entity *active_link_owner;
#endif
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
