Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[firefly-linux-kernel-4.4.55.git] / drivers / media / platform / exynos4-is / media-dev.c

diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c
index 344718df5c62885866d8c6ec0953163c7d99c60a..54c49d5e769021fa4036b2efe5dd02b9805ada5c 100644 (file)
--- a/drivers/media/platform/exynos4-is/media-dev.c
+++ b/drivers/media/platform/exynos4-is/media-dev.c
@@ -1098,8 +1098,10 @@ static int fimc_md_link_notify(struct media_link *link, unsigned int flags,
        if (notification == MEDIA_DEV_NOTIFY_PRE_LINK_CH) {
                if (!(flags & MEDIA_LNK_FL_ENABLED))
                        ret = __fimc_md_modify_pipelines(sink, false);
+#if 0
                else
-                       ; /* TODO: Link state change validation */
+                       /* TODO: Link state change validation */
+#endif
        /* After link activation */
        } else if (notification == MEDIA_DEV_NOTIFY_POST_LINK_CH &&
                   (link->flags & MEDIA_LNK_FL_ENABLED)) {