diff --git a/[refs] b/[refs]
index 4edc49cba8ed..6d3d0d4ab7f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d310f478e288ee7b2fa638339680460430e73e03
+refs/heads/master: 41df5bf088a10e54c0613ec4d7350b74d5ab8252
diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c b/trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c
index 75296a625a9d..f97ac02b8677 100644
--- a/trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c
+++ b/trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c
@@ -371,6 +371,8 @@ static int fimc_md_register_platform_entities(struct fimc_md *fmd)
 	 * Check if there is any sensor on the MIPI-CSI2 bus and
 	 * if not skip the s5p-csis module loading.
 	 */
+	if (pdata == NULL)
+		return 0;
 	for (i = 0; i < pdata->num_clients; i++) {
 		if (pdata->isp_info[i].bus_type == FIMC_MIPI_CSI2) {
 			ret = 1;