From c9898e9e30fad321432c5f571905de0c2a049ae8 Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Mon, 30 Apr 2012 12:10:58 -0300
Subject: [PATCH] --- yaml --- r: 306495 b: refs/heads/master c:
 41df5bf088a10e54c0613ec4d7350b74d5ab8252 h: refs/heads/master i:   306493:
 cd17d0c280a03d359c7d01b86a6bcf593a64cba0   306491:
 3109700a82dd460ed750c9dfc680941ed798611a   306487:
 bf8a493446c089cdf11e364afb65207dd98896af   306479:
 671ccb9d1c58050083437fc991dbfdd28421a92c   306463:
 b78396024bb48e7fbd1bd08d9bc2a0a089a94ba1   306431:
 525562f4cd1ad9abbd39b0b41f41713b397b4ecb v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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;