[media] s5p-fimc: Fix platform entities registration

Make sure the platform sub-devices are registered to the media
device driver only when v4l2_device_register_subdev() succeeds.

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>

1 files changed, 16 insertions, 17 deletions

diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/drivers/media/platform/s5p-fimc/fimc-mdevice.c
index 80ada5882f62..a55370219a96 100644
--- a/drivers/media/platform/s5p-fimc/fimc-mdevice.c
+++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.c
@@ -345,25 +345,23 @@ static int fimc_register_callback(struct device *dev, void *p)
         struct fimc_dev *fimc = dev_get_drvdata(dev);
         struct v4l2_subdev *sd = &fimc->vid_cap.subdev;
         struct fimc_md *fmd = p;
-        int ret = 0;
-
-        if (!fimc || !fimc->pdev)
-                return 0;
+        int ret;
 
-        if (fimc->pdev->id < 0 || fimc->pdev->id >= FIMC_MAX_DEVS)
+        if (fimc == NULL || fimc->id >= FIMC_MAX_DEVS)
                 return 0;
 
-        fimc->pipeline_ops = &fimc_pipeline_ops;
-        fmd->fimc[fimc->pdev->id] = fimc;
         sd->grp_id = FIMC_GROUP_ID;
 
         ret = v4l2_device_register_subdev(&fmd->v4l2_dev, sd);
         if (ret) {
                 v4l2_err(&fmd->v4l2_dev, "Failed to register FIMC.%d (%d)\n",
                          fimc->id, ret);
+                return ret;
         }
 
-        return ret;
+        fimc->pipeline_ops = &fimc_pipeline_ops;
+        fmd->fimc[fimc->id] = fimc;
+        return 0;
 }
 
 static int fimc_lite_register_callback(struct device *dev, void *p)
@@ -373,14 +371,9 @@ static int fimc_lite_register_callback(struct device *dev, void *p)
         struct fimc_md *fmd = p;
         int ret;
 
-        if (fimc == NULL)
+        if (fimc == NULL || fimc->index >= FIMC_LITE_MAX_DEVS)
                 return 0;
 
-        if (fimc->index >= FIMC_LITE_MAX_DEVS)
-                return 0;
-
-        fimc->pipeline_ops = &fimc_pipeline_ops;
-        fmd->fimc_lite[fimc->index] = fimc;
         sd->grp_id = FLITE_GROUP_ID;
 
         ret = v4l2_device_register_subdev(&fmd->v4l2_dev, sd);
@@ -388,8 +381,12 @@ static int fimc_lite_register_callback(struct device *dev, void *p)
                 v4l2_err(&fmd->v4l2_dev,
                          "Failed to register FIMC-LITE.%d (%d)\n",
                          fimc->index, ret);
+                return ret;
         }
-        return ret;
+
+        fimc->pipeline_ops = &fimc_pipeline_ops;
+        fmd->fimc_lite[fimc->index] = fimc;
+        return 0;
 }
 
 static int csis_register_callback(struct device *dev, void *p)
@@ -407,10 +404,12 @@ static int csis_register_callback(struct device *dev, void *p)
         v4l2_info(sd, "csis%d sd: %s\n", pdev->id, sd->name);
 
         id = pdev->id < 0 ? 0 : pdev->id;
-        fmd->csis[id].sd = sd;
         sd->grp_id = CSIS_GROUP_ID;
+
         ret = v4l2_device_register_subdev(&fmd->v4l2_dev, sd);
-        if (ret)
+        if (!ret)
+                fmd->csis[id].sd = sd;
+        else
                 v4l2_err(&fmd->v4l2_dev,
                          "Failed to register CSIS subdevice: %d\n", ret);
         return ret;