[media] s5p-fimc: Avoid crash with null platform_data
authorSylwester Nawrocki <s.nawrocki@samsung.com>
Mon, 30 Apr 2012 15:10:58 +0000 (12:10 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 20 May 2012 12:14:11 +0000 (09:14 -0300)
In commit "s5p-fimc: Handle sub-device interdependencies using deferred.."
there was a check added for pdata->num_clients without first checking
pdata against NULL. This causes a crash when platform_data is not set,
which is a valid use case. Fix this regression by skipping the MIPI-CSIS
subdev registration also when pdata is null.

Reported-by: HeungJun Kim <riverful.kim@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/s5p-fimc/fimc-mdevice.c

index 75296a625a9d6c0f25cd0d5b2c4a5c3e9359a330..f97ac02b8677e12b40f892fec48df88de25e65fd 100644 (file)
@@ -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;