diff --git a/[refs] b/[refs]
index 2846845ae9c8..d1512533fef4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c63afcb02b4313838d83c3660e45544d9fc9976
+refs/heads/master: d12392ec006d94e5cf6c98f7ed56ff0c881ec33f
diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c b/trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c
index fc81f6faa39a..615c862f0360 100644
--- a/trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c
+++ b/trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c
@@ -514,7 +514,7 @@ static int fimc_md_create_links(struct fimc_md *fmd)
 			if (WARN(csis == NULL,
 				 "MIPI-CSI interface specified "
 				 "but s5p-csis module is not loaded!\n"))
-				continue;
+				return -EINVAL;
 
 			ret = media_entity_create_link(&sensor->entity, 0,
 					      &csis->entity, CSIS_PAD_SINK,